Update to 118.0.2-1

- New upstrem release
- Add for browser.download.lastDir.savePerSite doesn't save download
  directory for originating site for blob downloads (e.g. mega.nz) bmo#1822730
- Rebase patches
- update mozconfig, remove obsolete pgo instruction

19 files changed, 159 insertions, 128 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d924a4f23c93..582111d93d4f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-kde-opensuse
 	pkgdesc = Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE
-	pkgver = 117.0.1
+	pkgver = 118.0.2
 	pkgrel = 1
 	url = https://github.com/openSUSE/firefox-maintenance
 	arch = i686
@@ -59,12 +59,12 @@ pkgbase = firefox-kde-opensuse
 	optdepends = pulseaudio: Audio support
 	optdepends = libnotify: Notification integration
 	optdepends = xdg-desktop-portal: Screensharing with Wayland
-	provides = firefox=117.0.1
+	provides = firefox=118.0.2
 	conflicts = firefox
 	options = !emptydirs
 	options = !lto
-	source = https://archive.mozilla.org/pub/firefox/releases/117.0.1/source/firefox-117.0.1.source.tar.xz
-	source = https://archive.mozilla.org/pub/firefox/releases/117.0.1/source/firefox-117.0.1.source.tar.xz.asc
+	source = https://archive.mozilla.org/pub/firefox/releases/118.0.2/source/firefox-118.0.2.source.tar.xz
+	source = https://archive.mozilla.org/pub/firefox/releases/118.0.2/source/firefox-118.0.2.source.tar.xz.asc
 	source = mozconfig
 	source = firefox.desktop
 	source = vendor.js
@@ -99,6 +99,7 @@ pkgbase = firefox-kde-opensuse
 	source = 0029-Shut-up-warnings-about-future-Rust-version-incompati.patch
 	source = 0030-Partially-revert-Bug-1768632-Make-EnumSet-compile-fo.patch
 	source = 0031-Bug-1796523-Workaround-source-locations-for-function.patch
+	source = 0032-Bug-1822730-Add-basic-blob-protocol-handling-for-blo.patch
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
 	sha256sums = 7ea4203b5cf9e59f80043597e2c9020291754fcab784a337586b5f5e1370c416
 	sha256sums = SKIP
diff --git a/0001-Bug-1504834-Rough-progress-patch.patch b/0001-Bug-1504834-Rough-progress-patch.patch
index b7b26e34d8b6..0c074d0139e9 100644
--- a/0001-Bug-1504834-Rough-progress-patch.patch
+++ b/0001-Bug-1504834-Rough-progress-patch.patch
@@ -11,7 +11,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1504834#c5
  3 files changed, 15 insertions(+), 13 deletions(-)
 
 diff --git a/gfx/2d/DrawTargetSkia.cpp b/gfx/2d/DrawTargetSkia.cpp
-index 2c2452a0cf57c9968070f53c5d87aaba21e9e87b..7aad12a2560c7429f150d7555507021f10bf942c 100644
+index b569438db44f5ba7869da4bc505f8950533cc8ec..1b6f70684886325d9b8b505b1f6f59a2dfb7023e 100644
 --- a/gfx/2d/DrawTargetSkia.cpp
 +++ b/gfx/2d/DrawTargetSkia.cpp
 @@ -155,8 +155,7 @@ static IntRect CalculateSurfaceBounds(const IntSize& aSize, const Rect* aBounds,
diff --git a/0005-mozilla-silence-no-return-type.patch-to-fix-build-er.patch b/0005-mozilla-silence-no-return-type.patch-to-fix-build-er.patch
index 8cfc0f58ee65..93b7394bda21 100644
--- a/0005-mozilla-silence-no-return-type.patch-to-fix-build-er.patch
+++ b/0005-mozilla-silence-no-return-type.patch-to-fix-build-er.patch
@@ -344,7 +344,7 @@ index dac03fe019d89482e91a29242b3027da80f28c8b..e18a04b4c5c95d1449662cfd8f7a7f97
  
  ResourceListener::~ResourceListener() {}
 diff --git a/third_party/libwebrtc/api/rtp_parameters.cc b/third_party/libwebrtc/api/rtp_parameters.cc
-index c1d12e5d8dc4be47fd751d656c99174b1433de09..e7fdfc2b7fc14a30df1d8770365985f219e7d4b7 100644
+index cf8b3ad3dcab8a802a2fb0a6b89d493417df98ba..5fbfd91517e95dc00eb563e440cdfb539be4ae26 100644
 --- a/third_party/libwebrtc/api/rtp_parameters.cc
 +++ b/third_party/libwebrtc/api/rtp_parameters.cc
 @@ -32,6 +32,7 @@ const char* DegradationPreferenceToString(
@@ -369,7 +369,7 @@ index 374b438adcbe961ed0b3787ca6d9a362c220e2d1..d2371b273712ef432b85e45ec478bf6d
  
  int I420BufferInterface::ChromaWidth() const {
 diff --git a/third_party/libwebrtc/api/video_codecs/video_codec.cc b/third_party/libwebrtc/api/video_codecs/video_codec.cc
-index f21c1a340171e831c94c505e162a2d8ac5d67d54..3c773d54b13cc9a17e9b3a0c27d968d4ae7ad498 100644
+index c6122d3f6ac3056ebcc654e1c268923f6057a738..1c78e6c0071a4ae36913d47e67d05389270f5095 100644
 --- a/third_party/libwebrtc/api/video_codecs/video_codec.cc
 +++ b/third_party/libwebrtc/api/video_codecs/video_codec.cc
 @@ -118,6 +118,7 @@ const char* CodecTypeToPayloadString(VideoCodecType type) {
@@ -488,10 +488,10 @@ index 05624b1f9227a28622a4d97629e782c61617c8a4..4de2e3e67ae08e6788894986fe48d508
  
  metrics::Histogram* CreateVolumeHistogram(InputVolumeType input_volume_type) {
 diff --git a/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_fc.cc b/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_fc.cc
-index 91501fb6e32cb00fa79ce170e95d7e49301717e6..d87d9586e103a8e5edf703a3e516f73e91e3516d 100644
+index a13e77461a15ad182ec5e6f8657823ed04f78291..398d4225131340ebf324e21e4ff46fa91c842747 100644
 --- a/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_fc.cc
 +++ b/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_fc.cc
-@@ -59,6 +59,8 @@ rtc::FunctionView<float(float)> GetActivationFunction(
+@@ -60,6 +60,8 @@ rtc::FunctionView<float(float)> GetActivationFunction(
      case ActivationFunction::kSigmoidApproximated:
        return ::rnnoise::SigmoidApproximated;
    }
@@ -562,7 +562,7 @@ index 90428464e3bca2e8b0268e977d03d27176aedf86..8f9f8ac3ee6b743cb1d025d0f3b4088b
  
  }  // namespace
 diff --git a/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc b/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc
-index 8d9e956779e0d9826652c6c97485c8107cb4ad3b..d9089fd36ef322acc2b1e3f9dd6de9b2a34ade49 100644
+index ebe6779e31be9bbeab5154171ca02fc9d90e8c2a..b78c38f97622ee7d2b24c8ebf6c3ab0c7931d7c7 100644
 --- a/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc
 +++ b/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc
 @@ -44,6 +44,7 @@ ScreenCastPortal::CaptureSourceType ScreenCastPortal::ToCaptureSourceType(
@@ -610,7 +610,7 @@ index f97fb167ed8b1e1f5b9e8aa3acf4cca5f067d35f..1b168f3fc6a22c55b4d7e958f9abfc4d
  
  bool HasBweExtension(const RtpHeaderExtensionMap& extensions_map) {
 diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc b/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc
-index 244f644bd1a1ee8f61e322270012b2cfbec5afda..c2187e469c1b078223a1fdf0266a3e82d9d9a64f 100644
+index 47b7b7910bd6a26748394c30cc0c932f6e1e0327..49326d2bee9c3d8df42e219b8e75c5ce34b63ed0 100644
 --- a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc
 +++ b/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc
 @@ -45,6 +45,7 @@ namespace {
@@ -620,7 +620,7 @@ index 244f644bd1a1ee8f61e322270012b2cfbec5afda..c2187e469c1b078223a1fdf0266a3e82
 +  return "";
  }
  
- constexpr char kIncludeCaptureClockOffset[] =
+ }  // namespace
 diff --git a/third_party/libwebrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc b/third_party/libwebrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc
 index 94860da1b6b2ddf44fb45a9c173d080ed85d24f7..ab24c6ff2cae88a58d04e59c07b7b992566792eb 100644
 --- a/third_party/libwebrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc
diff --git a/0006-Bug-531915-mozilla-bmo531915.patch.patch b/0006-Bug-531915-mozilla-bmo531915.patch.patch
index b6c43fc72484..5b8160997eec 100644
--- a/0006-Bug-531915-mozilla-bmo531915.patch.patch
+++ b/0006-Bug-531915-mozilla-bmo531915.patch.patch
@@ -9,7 +9,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1729459
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/modules/fdlibm/src/math_private.h b/modules/fdlibm/src/math_private.h
-index f4373f27834ab794d3ea7bf5fa72caa0a2480e8f..4430e496e8e9251e702b47e68ec88b4f9f0fa3f2 100644
+index b588a5905f40597f78f6a069ed6571f8cb74b57c..beae1f4c077b4cc527525f0ea09bbcdcd3380a44 100644
 --- a/modules/fdlibm/src/math_private.h
 +++ b/modules/fdlibm/src/math_private.h
 @@ -30,9 +30,14 @@
diff --git a/0010-mozilla-s390-context.patch.patch b/0010-mozilla-s390-context.patch.patch
index bf4c7d9562bd..187480fc971c 100644
--- a/0010-mozilla-s390-context.patch.patch
+++ b/0010-mozilla-s390-context.patch.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] mozilla-s390-context.patch
  1 file changed, 8 insertions(+)
 
 diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
-index 33e6c32b061bf7bcfcb25f4297afbe2a53c45566..3ff07c5868c607fc48e822dfac6823bcaf9d058c 100644
+index f779e93ef6e4c283f937e01cae6b1d5ac7e94cd3..60df097716fc59545cb2ef75bba4de2a31473365 100644
 --- a/js/src/wasm/WasmSignalHandlers.cpp
 +++ b/js/src/wasm/WasmSignalHandlers.cpp
 @@ -174,6 +174,10 @@ using mozilla::DebugOnly;
diff --git a/0011-bsc-991344-Rpi3-Firefox-crashes-after-a-few-seconds-.patch b/0011-bsc-991344-Rpi3-Firefox-crashes-after-a-few-seconds-.patch
index b37f35727a87..564271667fc1 100644
--- a/0011-bsc-991344-Rpi3-Firefox-crashes-after-a-few-seconds-.patch
+++ b/0011-bsc-991344-Rpi3-Firefox-crashes-after-a-few-seconds-.patch
@@ -10,10 +10,10 @@ bmo#1302554 - ARM/AARCH64: Firefox crashes on NULL nsIChannel** result pointer i
  1 file changed, 6 insertions(+)
 
 diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp
-index 1a0c225018b7f48a648009a2d393fffc5089173f..bb5edd300131028f76b9427a20a82f27eb8e2b91 100644
+index d25fa2945223c231a428064f6d8aa450fe77eeaf..cb7093d6aa1e7accef7281315128c3f9e022066c 100644
 --- a/netwerk/base/nsIOService.cpp
 +++ b/netwerk/base/nsIOService.cpp
-@@ -1159,7 +1159,13 @@ nsresult nsIOService::NewChannelFromURIWithProxyFlagsInternal(
+@@ -1148,7 +1148,13 @@ nsresult nsIOService::NewChannelFromURIWithProxyFlagsInternal(
      }
    }
  
diff --git a/0019-Bug-559213-Support-system-av1.patch b/0019-Bug-559213-Support-system-av1.patch
index d08b26df2a02..727394c6151f 100644
--- a/0019-Bug-559213-Support-system-av1.patch
+++ b/0019-Bug-559213-Support-system-av1.patch
@@ -16,10 +16,10 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  5 files changed, 42 insertions(+), 8 deletions(-)
 
 diff --git a/config/external/moz.build b/config/external/moz.build
-index a0877c9d717e84489e19ee532d61df43b8a19889..5caa2036e0ece1404b16c52a31235f12addda08b 100644
+index fe765d1fa0130296b9b89129ad5bf5f55a885823..58396762e2e6950855816e4ce175b5cb29d4d5ce 100644
 --- a/config/external/moz.build
 +++ b/config/external/moz.build
-@@ -45,8 +45,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
+@@ -40,8 +40,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
      external_dirs += ["media/libvpx"]
  
  if CONFIG["MOZ_AV1"]:
@@ -32,10 +32,10 @@ index a0877c9d717e84489e19ee532d61df43b8a19889..5caa2036e0ece1404b16c52a31235f12
  if not CONFIG["MOZ_SYSTEM_PNG"]:
      external_dirs += ["media/libpng"]
 diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
-index d9489c8f15e4f320a2947f2fef4f98d92acb292e..4d2f15e18c1c0755a1e28fd8e20a87f41e2f4eeb 100644
+index dc7f580453a7f171ddfe795f450bf1cfe1bf6b7a..f0404231eab0ba35391cad2f87ccfbf0afec4d67 100644
 --- a/config/system-headers.mozbuild
 +++ b/config/system-headers.mozbuild
-@@ -1291,6 +1291,14 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']:
+@@ -1296,6 +1296,14 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']:
          'proxy.h',
      ]
  
@@ -67,10 +67,10 @@ index c71f22a22eeead703192edfb710cc6113d42c11c..e91f57de9017e74436b03b769f04668d
  if CONFIG["MOZ_OMX"]:
      EXPORTS += [
 diff --git a/media/ffvpx/libavcodec/moz.build b/media/ffvpx/libavcodec/moz.build
-index 5675c28234a14f7cbfb4e719b78b248ac63fcf0a..56344e5e4c98b2efd501875636bb54ed12829663 100644
+index 845d0030229cc2a81eaa1a0ca341d0175af3d976..3b5d5153fc9f49ed729eb5685e8d677932af3920 100644
 --- a/media/ffvpx/libavcodec/moz.build
 +++ b/media/ffvpx/libavcodec/moz.build
-@@ -109,10 +109,14 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
+@@ -118,10 +118,14 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
          'vp9recon.c',
          'vpx_rac.c',
      ]
@@ -90,10 +90,10 @@ index 5675c28234a14f7cbfb4e719b78b248ac63fcf0a..56344e5e4c98b2efd501875636bb54ed
          LOCAL_INCLUDES += ['/media/mozva']
          SOURCES += [
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index fd90272f650bc3fbfbec0b79d031b00523267e87..5cf3ef5454a6580e14a06db7e448336d58452586 100644
+index e0a54645f8fcf49ab89525740008afb030c9ab12..badeb8dc4b629a9dba166bf270aa24e567288df5 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
-@@ -744,14 +744,29 @@ def av1(value):
+@@ -743,14 +743,29 @@ def av1(value):
      if value:
          return True
  
@@ -125,7 +125,7 @@ index fd90272f650bc3fbfbec0b79d031b00523267e87..5cf3ef5454a6580e14a06db7e448336d
  def dav1d_nasm(target):
      if target.cpu in ("x86", "x86_64"):
          return namespace(version="2.14", what="AV1")
-@@ -761,6 +776,7 @@ set_config("MOZ_DAV1D_ASM", dav1d_asm)
+@@ -760,6 +775,7 @@ set_config("MOZ_DAV1D_ASM", dav1d_asm)
  set_define("MOZ_DAV1D_ASM", dav1d_asm)
  set_config("MOZ_AV1", av1)
  set_define("MOZ_AV1", av1)
diff --git a/0020-Bug-847568-Support-system-harfbuzz.patch b/0020-Bug-847568-Support-system-harfbuzz.patch
index 2315b0a7596e..612c2025038d 100644
--- a/0020-Bug-847568-Support-system-harfbuzz.patch
+++ b/0020-Bug-847568-Support-system-harfbuzz.patch
@@ -21,10 +21,10 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  10 files changed, 40 insertions(+), 1 deletion(-)
 
 diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
-index 4d2f15e18c1c0755a1e28fd8e20a87f41e2f4eeb..daf1222bdb06aba229ed939212763c79b935366a 100644
+index f0404231eab0ba35391cad2f87ccfbf0afec4d67..53cbde197a2956052d1e0b0da1917716837c20b1 100644
 --- a/config/system-headers.mozbuild
 +++ b/config/system-headers.mozbuild
-@@ -1235,6 +1235,13 @@ if CONFIG['OS_TARGET'] == 'Android':
+@@ -1240,6 +1240,13 @@ if CONFIG['OS_TARGET'] == 'Android':
          'vr/gvr/capi/include/gvr.h',
      ]
  
@@ -39,10 +39,10 @@ index 4d2f15e18c1c0755a1e28fd8e20a87f41e2f4eeb..daf1222bdb06aba229ed939212763c79
      system_headers += [
          'jack/jack.h',
 diff --git a/dom/base/moz.build b/dom/base/moz.build
-index 19990d90ff73533898c9cf017e4c52852114e93d..817344b497cb24398ebce2428313596c63d70c02 100644
+index 7c24df79968ccf552ac25e98ae255699c30dc382..0c21e786dc0ad09907694af294baad7e831fe59e 100644
 --- a/dom/base/moz.build
 +++ b/dom/base/moz.build
-@@ -609,6 +609,9 @@ FINAL_LIBRARY = "xul"
+@@ -608,6 +608,9 @@ FINAL_LIBRARY = "xul"
  if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
      CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
  
@@ -143,10 +143,10 @@ index 17612ff1b396891c8942f53d3f39fbca8bdca6cb..d6d51948da54c7fbca53662050d33019
 +
  USE_LIBS += ["icu"]
 diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
-index 939d4f6a4b8da54c064ebbbda541b412979d5bab..1d964af4f1e237ef419b15c954a5a3b663c9ce92 100644
+index 3faa0370cc1c0025f03f0011c73876c0da8a6e71..fb81f6ceebcb4c6c14d0e2e2df48531b74d174bf 100644
 --- a/toolkit/library/moz.build
 +++ b/toolkit/library/moz.build
-@@ -285,6 +285,9 @@ if CONFIG["MOZ_ANDROID_GOOGLE_VR"]:
+@@ -286,6 +286,9 @@ if CONFIG["MOZ_ANDROID_GOOGLE_VR"]:
          "-lgvr",
      ]
  
@@ -157,7 +157,7 @@ index 939d4f6a4b8da54c064ebbbda541b412979d5bab..1d964af4f1e237ef419b15c954a5a3b6
      OS_LIBS += CONFIG["MOZ_JPEG_LIBS"]
  
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index 5cf3ef5454a6580e14a06db7e448336d58452586..115febb3d533eb69cecbe0931b00be4e910e20de 100644
+index badeb8dc4b629a9dba166bf270aa24e567288df5..510db578b5e1b15fde924db8d0878588fe2f7526 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
 @@ -675,6 +675,15 @@ def freetype2_combined_info(fontconfig_info, freetype2_info):
diff --git a/0021-Bug-847568-Support-system-graphite2.patch b/0021-Bug-847568-Support-system-graphite2.patch
index b0118a1f7177..46149eddde66 100644
--- a/0021-Bug-847568-Support-system-graphite2.patch
+++ b/0021-Bug-847568-Support-system-graphite2.patch
@@ -20,10 +20,10 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  create mode 100644 gfx/graphite2/geckoextra/moz.build
 
 diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
-index daf1222bdb06aba229ed939212763c79b935366a..4eca67cc9e6baa43e7bcf7ac057c243dbc6ccee5 100644
+index 53cbde197a2956052d1e0b0da1917716837c20b1..cae9c78f51c3eea97a954c9e830e88544bbcbdee 100644
 --- a/config/system-headers.mozbuild
 +++ b/config/system-headers.mozbuild
-@@ -1242,6 +1242,12 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+@@ -1247,6 +1247,12 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
  	'harfbuzz/hb.h',
      ]
  
@@ -134,10 +134,10 @@ index 8af85a4ed663292583310efea06ada8c60eb908d..239579c86e3a0c5ef46c14659117a86d
  if CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
      CXXFLAGS += CONFIG["MOZ_HARFBUZZ_CFLAGS"]
 diff --git a/old-configure.in b/old-configure.in
-index 8ff0fccfc4293ca8e148ad261bed745613c5cf74..fe93c1d49071e7c3edb9ff850c1bc92c4c2def06 100644
+index 0dfcddd0f14eddf7df73913417eb2e617a598b43..95850f11b4d9516c9dd0b9b04e504ef60cdba0a5 100644
 --- a/old-configure.in
 +++ b/old-configure.in
-@@ -1154,6 +1154,27 @@ fi
+@@ -1146,6 +1146,27 @@ fi
  AC_DEFINE_UNQUOTED(MOZ_MACBUNDLE_ID,$MOZ_MACBUNDLE_ID)
  AC_SUBST(MOZ_MACBUNDLE_ID)
  
@@ -166,10 +166,10 @@ index 8ff0fccfc4293ca8e148ad261bed745613c5cf74..fe93c1d49071e7c3edb9ff850c1bc92c
  dnl = Child Process Name for IPC
  dnl ========================================================
 diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
-index 1d964af4f1e237ef419b15c954a5a3b663c9ce92..c139842714a0036c807859ca03b8aed8f876a895 100644
+index fb81f6ceebcb4c6c14d0e2e2df48531b74d174bf..e43d77d815ace132469fe3c1ecca7256fce1e0f7 100644
 --- a/toolkit/library/moz.build
 +++ b/toolkit/library/moz.build
-@@ -285,6 +285,9 @@ if CONFIG["MOZ_ANDROID_GOOGLE_VR"]:
+@@ -286,6 +286,9 @@ if CONFIG["MOZ_ANDROID_GOOGLE_VR"]:
          "-lgvr",
      ]
  
@@ -180,7 +180,7 @@ index 1d964af4f1e237ef419b15c954a5a3b663c9ce92..c139842714a0036c807859ca03b8aed8
      OS_LIBS += CONFIG["MOZ_HARFBUZZ_LIBS"]
  
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index 115febb3d533eb69cecbe0931b00be4e910e20de..54425af01317562fb3204fe7bc01a494b8f2167d 100644
+index 510db578b5e1b15fde924db8d0878588fe2f7526..ded2b7099ec841b93d74fc14d7ef733acdbba0bb 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
 @@ -675,6 +675,19 @@ def freetype2_combined_info(fontconfig_info, freetype2_info):
diff --git a/0022-Bug-1611386-Reenable-support-for-enable-system-sqlit.patch b/0022-Bug-1611386-Reenable-support-for-enable-system-sqlit.patch
index 2e4c66e0c3ef..12f6614f8c9a 100644
--- a/0022-Bug-1611386-Reenable-support-for-enable-system-sqlit.patch
+++ b/0022-Bug-1611386-Reenable-support-for-enable-system-sqlit.patch
@@ -24,7 +24,7 @@ Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>
  9 files changed, 70 insertions(+), 14 deletions(-)
 
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
-index ce036fcdc55dc5b42709364775eeb779d64ee62c..ee420cf6363d598cd20b37bef6199dbe77f605c0 100644
+index 5296d2b4b195d6c5d3f61aa43ea8d1d2fdad053f..ca0a730183836121fe53ccddada31f8746361514 100644
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
 @@ -147,9 +147,11 @@
@@ -37,8 +37,8 @@ index ce036fcdc55dc5b42709364775eeb779d64ee62c..ee420cf6363d598cd20b37bef6199dbe
  #endif
 +#endif
  @BINPATH@/@DLL_PREFIX@lgpllibs@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@gkcodecs@DLL_SUFFIX@
  #ifdef MOZ_FFVPX
- @BINPATH@/@DLL_PREFIX@mozavutil@DLL_SUFFIX@
 diff --git a/config/external/sqlite/moz.build b/config/external/sqlite/moz.build
 index 6294924c564ae8c2ebc0033895be91069179fcd2..b978fd9caba375242de1be25072b251461010044 100644
 --- a/config/external/sqlite/moz.build
@@ -104,12 +104,12 @@ index b7198b1912fdc8d1182a445421aec3450474c23d..3ecc0bb997cf376e996bff2d9c184ecf
      // treat them as such.
      Release();  // Call is protected by us holding the mutex.
 diff --git a/storage/moz.build b/storage/moz.build
-index 9cefe26ec0c83fc6f9fbce3fee6604c86a10fc98..1c473a5c3adf605eb8ceeeed28923a4b5f38d4a1 100644
+index 3509923c39b74218dfa11261ef67e9e40f89eea5..d5ef35b92fd6706e3f9879054bcda51b66d57e4b 100644
 --- a/storage/moz.build
 +++ b/storage/moz.build
-@@ -101,6 +101,12 @@ if CONFIG["MOZ_THUNDERBIRD"] or CONFIG["MOZ_SUITE"]:
- # will need to change it here as well.
- DEFINES["SQLITE_MAX_LIKE_PATTERN_LENGTH"] = 50000
+@@ -105,6 +105,12 @@ DEFINES["SQLITE_MAX_LIKE_PATTERN_LENGTH"] = 50000
+ if not CONFIG["MOZ_AVOID_DISK_REMNANT_ON_CLOSE"]:
+     DEFINES["MOZ_SQLITE_PERSIST_AUXILIARY_FILES"] = 1
  
 +# See Sqlite moz.build for reasoning about TEMP_STORE.
 +# For system sqlite we cannot use the compile time option, so we use a pragma.
@@ -214,7 +214,7 @@ index fc576f30bc6a47db5c8bfbaa77bb117f1bd68011..903d6b29f62528b6ecd762ef69fb5f20
  sqlite3_complete16
  sqlite3_config
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index 54425af01317562fb3204fe7bc01a494b8f2167d..dd9583868a0e15e5c3f4c56852531ff6fbe921eb 100644
+index ded2b7099ec841b93d74fc14d7ef733acdbba0bb..17726440ef2122a29e6966220287ccdbe5677b10 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
 @@ -377,6 +377,20 @@ sndio = pkg_check_modules("MOZ_SNDIO", "sndio", when="--enable-sndio")
diff --git a/0023-Bug-1419151-Add-Unity-menubar-support.patch b/0023-Bug-1419151-Add-Unity-menubar-support.patch
index bcb71037c181..c67857301933 100644
--- a/0023-Bug-1419151-Add-Unity-menubar-support.patch
+++ b/0023-Bug-1419151-Add-Unity-menubar-support.patch
@@ -84,10 +84,10 @@ index fca2398bfc97aad365d3b446fab06f2a7863948e..fe057e454e9fcfa04db17d44306357a7
                                                      event.target.parentNode.openedWithKey);"
  #endif
 diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
-index 81fd02efc6461c052101169415f4015003b77590..eec0cc5b0e402f113052635781c806c290df3acc 100644
+index 1b1e3ed5c972d6629adb2cfd7dcf051d2489398b..fe7c8dc6dc8ff0e854253b3eb45a814630c871ee 100644
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
-@@ -6298,11 +6298,18 @@ function onViewToolbarsPopupShowing(aEvent, aInsertPoint) {
+@@ -6327,11 +6327,18 @@ function onViewToolbarsPopupShowing(aEvent, aInsertPoint) {
    MozXULElement.insertFTLIfNeeded("browser/toolbarContextMenu.ftl");
    let firstMenuItem = aInsertPoint || popup.firstElementChild;
    let toolbarNodes = gNavToolbox.querySelectorAll("toolbar");
@@ -175,7 +175,7 @@ index b2059e396efec51ec515540e69adfd18a74a906f..5f00ef562b374aa5d1d5792240395c4a
  XPCOM_MANIFESTS += [
      "components.conf",
 diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
-index 6a02e703ddf31424b1c566a2e4277ad8be7fddd9..dc8c9ea830cdbbaa01fd1007b642dde08f097bf8 100644
+index a190b6caff8c21fb6bedaf37b9c25c812cd7114a..8bf1016739f21adb983d4cbfdc6858a01ece8601 100644
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
 @@ -167,6 +167,9 @@ pref("dom.text-recognition.enabled", true);
@@ -280,7 +280,7 @@ index 0000000000000000000000000000000000000000..0843d45185e51f6f59ded657cb57ac0d
 +
 +#endif  // mozilla_widget_NativeMenuSupport_h
 diff --git a/widget/gtk/components.conf b/widget/gtk/components.conf
-index a2759a3c45cc020f54799ce61151dd45c03210fd..17c040e3ef6c2ddf2d876b3b5954ca8d70a26839 100644
+index 851de59d0c66dff8a593f494c5ea8a8fe88535b2..c6fa8c129c773f6fc377912dce921ab5af2b4542 100644
 --- a/widget/gtk/components.conf
 +++ b/widget/gtk/components.conf
 @@ -115,6 +115,14 @@ Classes = [
@@ -5263,10 +5263,10 @@ index 0000000000000000000000000000000000000000..2e0d429eddfdfc84620834eced6b9733
 +
 +#endif /* __nsNativeMenuService_h__ */
 diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
-index 9cc6e8a1aebf69b4d720da7745d08b929f46b13e..7c5cade259877d4ea429f4385bb2278776ab1946 100644
+index be700ff20db1a4ca68c06e5882831a6d72fef0ca..e1a2d331eb555eaa0d98a2099cccccf6712512aa 100644
 --- a/widget/gtk/nsWindow.cpp
 +++ b/widget/gtk/nsWindow.cpp
-@@ -7481,6 +7481,10 @@ void nsWindow::HideWindowChrome(bool aShouldHide) {
+@@ -7486,6 +7486,10 @@ void nsWindow::HideWindowChrome(bool aShouldHide) {
    SetWindowDecoration(aShouldHide ? BorderStyle::None : mBorderStyle);
  }
  
@@ -5278,7 +5278,7 @@ index 9cc6e8a1aebf69b4d720da7745d08b929f46b13e..7c5cade259877d4ea429f4385bb22787
                                bool aAlwaysRollup) {
    LOG("nsWindow::CheckForRollup() aAlwaysRollup %d", aAlwaysRollup);
 diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h
-index fa90621be4785a84950e7d80333acde7eb676a16..c815ca73b11bc59cfc56544f37e3b04fa0e08145 100644
+index a892a08cfa2e24e3dfd3809def7e8502b0632bb7..6aaa94f0503f88f8408bba82d07cfa137e14527a 100644
 --- a/widget/gtk/nsWindow.h
 +++ b/widget/gtk/nsWindow.h
 @@ -27,6 +27,8 @@
@@ -5299,7 +5299,7 @@ index fa90621be4785a84950e7d80333acde7eb676a16..c815ca73b11bc59cfc56544f37e3b04f
    /**
     * GetLastUserInputTime returns a timestamp for the most recent user input
     * event.  This is intended for pointer grab requests (including drags).
-@@ -927,6 +931,8 @@ class nsWindow final : public nsBaseWidget {
+@@ -926,6 +930,8 @@ class nsWindow final : public nsBaseWidget {
  
    static bool sTransparentMainWindow;
  
@@ -5404,7 +5404,7 @@ index 0000000000000000000000000000000000000000..488c8f49c0217890d2c5a12f57fdc194
 +    Atom("shellshowingmenubar", "shellshowingmenubar"),
 +]
 diff --git a/xpcom/ds/StaticAtoms.py b/xpcom/ds/StaticAtoms.py
-index 2fbb11fd7b34fa4011dc991a583b5fa5872589ed..e32fa2cb9a881e75459df5bdcd496bad528ccdf6 100644
+index eb3997411a692ff1edb86c967236e25f90bdc46d..1a9e22911eada7288c5af751d974468181dc85e0 100644
 --- a/xpcom/ds/StaticAtoms.py
 +++ b/xpcom/ds/StaticAtoms.py
 @@ -13,6 +13,7 @@ from Atom import (
@@ -5415,7 +5415,7 @@ index 2fbb11fd7b34fa4011dc991a583b5fa5872589ed..e32fa2cb9a881e75459df5bdcd496bad
  
  # Static atom definitions, used to generate nsGkAtomList.h.
  #
-@@ -2550,7 +2551,7 @@ STATIC_ATOMS = [
+@@ -2549,7 +2550,7 @@ STATIC_ATOMS = [
      InheritingAnonBoxAtom("AnonBox_mozSVGForeignContent", ":-moz-svg-foreign-content"),
      InheritingAnonBoxAtom("AnonBox_mozSVGText", ":-moz-svg-text"),
      # END ATOMS
@@ -5425,10 +5425,10 @@ index 2fbb11fd7b34fa4011dc991a583b5fa5872589ed..e32fa2cb9a881e75459df5bdcd496bad
  
  
 diff --git a/xpfe/appshell/AppWindow.cpp b/xpfe/appshell/AppWindow.cpp
-index 3ecd6d18d7241967cea20862c198d09336a74bf1..e90165545ce5a1f7d6ee11896bd1ab74cb3bdbd9 100644
+index ea2b7029426300ed33acbfd33302392a6c17a4d4..231b47372caf18e1a7fa3206cff103a43006f8ce 100644
 --- a/xpfe/appshell/AppWindow.cpp
 +++ b/xpfe/appshell/AppWindow.cpp
-@@ -78,7 +78,7 @@
+@@ -77,7 +77,7 @@
  
  #include "mozilla/dom/DocumentL10n.h"
  
diff --git a/0025-Add-KDE-integration-to-Firefox-toolkit-parts.patch b/0025-Add-KDE-integration-to-Firefox-toolkit-parts.patch
index c8cbf2bbf019..97f116feb455 100644
--- a/0025-Add-KDE-integration-to-Firefox-toolkit-parts.patch
+++ b/0025-Add-KDE-integration-to-Firefox-toolkit-parts.patch
@@ -2,14 +2,20 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Date: Tue, 8 Aug 2023 16:13:48 +0300
 Subject: [PATCH] Add KDE integration to Firefox (toolkit parts)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
 Bug: https://bugzilla.suse.com/show_bug.cgi?id=170055
 
+EDIT: Björn Bidar: Removed handling for obsolete special files
+
 Co-authored-by: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Co-authored-by: Lubos Lunak <lunak@suse.com>
+Co-authored-by: Björn Bidar <bjorn.bidar@thaodan.de>
 ---
- modules/libpref/Preferences.cpp               |  13 +-
+ modules/libpref/Preferences.cpp               |   1 +
  modules/libpref/moz.build                     |   4 +
  python/mozbuild/mozpack/chrome/flags.py       |   1 +
  python/mozbuild/mozpack/chrome/manifest.py    |   1 +
@@ -33,7 +39,7 @@ Co-authored-by: Lubos Lunak <lunak@suse.com>
  xpcom/components/ManifestParser.cpp           |  10 +
  xpcom/components/moz.build                    |   1 +
  xpcom/io/nsLocalFileUnix.cpp                  |  20 +-
- 24 files changed, 921 insertions(+), 37 deletions(-)
+ 24 files changed, 910 insertions(+), 36 deletions(-)
  create mode 100644 toolkit/xre/nsKDEUtils.cpp
  create mode 100644 toolkit/xre/nsKDEUtils.h
  create mode 100644 uriloader/exthandler/unix/nsCommonRegistry.cpp
@@ -42,7 +48,7 @@ Co-authored-by: Lubos Lunak <lunak@suse.com>
  create mode 100644 uriloader/exthandler/unix/nsKDERegistry.h
 
 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
-index 9e0853d1a5b7cf9dd05a15db3499dd18fcf73803..1ab9be4e7415ddd19f393b6856c13c462059b111 100644
+index 94a5aa0f3f169563d570e18fc1a525994293ad99..c1cf316d05b742502f7b07da1b7f25024b09f4e8 100644
 --- a/modules/libpref/Preferences.cpp
 +++ b/modules/libpref/Preferences.cpp
 @@ -95,6 +95,7 @@
@@ -53,32 +59,6 @@ index 9e0853d1a5b7cf9dd05a15db3499dd18fcf73803..1ab9be4e7415ddd19f393b6856c13c46
  
  #ifdef DEBUG
  #  include <map>
-@@ -4906,6 +4907,16 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) {
- #endif
-   };
- 
-+  if (nsKDEUtils::kdeSession()) {  // TODO what if some setup actually requires
-+                                   // the helper?
-+    for (int i = 0; i < MOZ_ARRAY_LENGTH(specialFiles); ++i) {
-+      if (*specialFiles[i] == '\0') {
-+        specialFiles[i] = "kde.js";
-+        break;
-+      }
-+    }
-+  }
-+
-   rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles,
-                            ArrayLength(specialFiles));
-   if (NS_FAILED(rv)) {
-@@ -4980,7 +4991,7 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) {
-       }
- 
-       // Do we care if a file provided by this process fails to load?
--      pref_LoadPrefsInDir(path, nullptr, 0);
-+      pref_LoadPrefsInDir(path, specialFiles, ArrayLength(specialFiles));
-     }
-   }
- 
 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
 index e8f8b97170d32c1d3ac342dd93da7265bf707c8f..831001cee4b1eb33171d83d524ee9e453a800257 100644
 --- a/modules/libpref/moz.build
diff --git a/0026-Add-KDE-integration-to-Firefox.patch b/0026-Add-KDE-integration-to-Firefox.patch
index 1e2e93858ec3..0438adce847f 100644
--- a/0026-Add-KDE-integration-to-Firefox.patch
+++ b/0026-Add-KDE-integration-to-Firefox.patch
@@ -27,7 +27,7 @@ How to apply this patch:
  create mode 100644 browser/components/shell/nsUnixShellService.h
 
 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
-index 820e46fb006567bfdf93e2a46da5e3c07d42bf10..57d1c21bdecc2d55d0bed30246e684d3b97ad7fa 100644
+index 609b9a9d06178b42b0ba8509500a1b72d8bd3b88..05df0fc6ce279ab6161a3f93450e7296c95a371f 100644
 --- a/browser/components/preferences/main.js
 +++ b/browser/components/preferences/main.js
 @@ -294,6 +294,13 @@ var gMainPane = {
@@ -44,7 +44,7 @@ index 820e46fb006567bfdf93e2a46da5e3c07d42bf10..57d1c21bdecc2d55d0bed30246e684d3
      this.initBrowserContainers();
      this.buildContentProcessCountMenuList();
  
-@@ -1727,6 +1734,17 @@ var gMainPane = {
+@@ -1725,6 +1732,17 @@ var gMainPane = {
        }
        try {
          shellSvc.setDefaultBrowser(true, false);
diff --git a/0027-Imported-patch-firefox-branded-icons.patch.patch b/0027-Imported-patch-firefox-branded-icons.patch.patch
index acbf44c3027b..4c0f83fd48f4 100644
--- a/0027-Imported-patch-firefox-branded-icons.patch.patch
+++ b/0027-Imported-patch-firefox-branded-icons.patch.patch
@@ -23,10 +23,10 @@ index 4e737310b37bc0bdbe4367e51c0f245eefbdbb50..0faf21fb931a0ed72495197d2152fd74
              'default48.png',
              'default64.png',
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
-index ee420cf6363d598cd20b37bef6199dbe77f605c0..0f7d804e47a8c97dbd28081320c7ee271fd23725 100644
+index ca0a730183836121fe53ccddada31f8746361514..0d666fd391e729ba050721a7a4073b57f0a5425b 100644
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -224,10 +224,13 @@
+@@ -225,10 +225,13 @@
  @RESPATH@/chrome/toolkit.manifest
  #ifdef MOZ_GTK
  @RESPATH@/browser/chrome/icons/default/default16.png
diff --git a/0028-Allow-Eme-for-arm-and-Aarch64.patch b/0028-Allow-Eme-for-arm-and-Aarch64.patch
index a371a3a1e5a2..b44d391bee66 100644
--- a/0028-Allow-Eme-for-arm-and-Aarch64.patch
+++ b/0028-Allow-Eme-for-arm-and-Aarch64.patch
@@ -12,10 +12,10 @@ Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index dd9583868a0e15e5c3f4c56852531ff6fbe921eb..e3dca0c5e58b7a118fb820e148efb55d41d8eb8d 100644
+index 17726440ef2122a29e6966220287ccdbe5677b10..ddb2c59e17d386b3f834f7c190c287790d4760d4 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
-@@ -906,7 +906,7 @@ def eme_choices(target, wmf):
+@@ -863,7 +863,7 @@ def eme_choices(target, wmf):
      if (
          target.kernel in ("WINNT", "Linux")
          and target.os != "Android"
diff --git a/0029-Shut-up-warnings-about-future-Rust-version-incompati.patch b/0029-Shut-up-warnings-about-future-Rust-version-incompati.patch
index e70db022d136..6bdfd0ba43de 100644
--- a/0029-Shut-up-warnings-about-future-Rust-version-incompati.patch
+++ b/0029-Shut-up-warnings-about-future-Rust-version-incompati.patch
@@ -12,10 +12,10 @@ Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/Cargo.toml b/Cargo.toml
-index fa9390e192f4ddd6e8b897faf0fc0dff69728242..a8c97ba3fe594898302b5df57962132138c7f850 100644
+index 1437c717633023482de42cc96a56fe98e431fb89..9382614c4b5c32575bb90cb81ee1624bb2febf62 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -211,3 +211,8 @@ uniffi_bindgen = "=0.24.3"
+@@ -226,3 +226,8 @@ uniffi_bindgen = "=0.24.3"
  uniffi_build = "=0.24.3"
  uniffi_macros = "=0.24.3"
  weedle2 = "=4.0.0"
diff --git a/0032-Bug-1822730-Add-basic-blob-protocol-handling-for-blo.patch b/0032-Bug-1822730-Add-basic-blob-protocol-handling-for-blo.patch
new file mode 100644
index 000000000000..76d06bba9029
--- /dev/null
+++ b/0032-Bug-1822730-Add-basic-blob-protocol-handling-for-blo.patch
@@ -0,0 +1,55 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Rob Krum <biggestsonicfan@gmail.com>
+Date: Fri, 22 Sep 2023 18:23:35 -0700
+Subject: [PATCH] Bug 1822730 - Add basic blob protocol handling for blob URIs
+ that contain parsable http/s protocols
+
+---
+ .../mozapps/downloads/DownloadLastDir.sys.mjs   | 17 +++++++++++++++--
+ 1 file changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/toolkit/mozapps/downloads/DownloadLastDir.sys.mjs b/toolkit/mozapps/downloads/DownloadLastDir.sys.mjs
+index 9fe90a0ecdc533593001d9a2763f8a21f393ce7d..2a2f524716c909dfa3f04b649b9f078fecd3d1f9 100644
+--- a/toolkit/mozapps/downloads/DownloadLastDir.sys.mjs
++++ b/toolkit/mozapps/downloads/DownloadLastDir.sys.mjs
+@@ -221,11 +221,13 @@ export class DownloadLastDir {
+ 
+   /**
+    * Pre-processor to extract a domain name to be used with the content-prefs
+-   * service. This specially handles data and file URIs so that the download
+-   * dirs are recalled in a more consistent way:
++   * service. This specially handles data, file and blob URIs so that the
++   * download dirs are recalled in a more consistent way:
+    *  - all file:/// URIs share the same folder
+    *  - data: URIs share a folder per mime-type. If a mime-type is not
+    *    specified text/plain is assumed.
++   *  - blob: blob URIs are tested for http/https and the blob protocol
++   *    is stripped.
+    * In any other case the original URL is returned as a string and ContentPrefs
+    * will do its usual parsing.
+    *
+@@ -234,6 +236,9 @@ export class DownloadLastDir {
+    */
+   #cpsGroupFromURL(url) {
+     if (typeof url == "string") {
++      if (url.startsWith("blob:http://") || url.startsWith("blob:https://")) {
++        url = url.replace("blob:", "");
++      }
+       url = new URL(url);
+     } else if (url instanceof Ci.nsIURI) {
+       url = URL.fromURI(url);
+@@ -241,6 +246,14 @@ export class DownloadLastDir {
+     if (!URL.isInstance(url)) {
+       return url;
+     }
++    if (url.protocol == "blob:") {
++      if (
++        url.href.startsWith("blob:http://") ||
++        url.href.startsWith("blob:https://")
++      ) {
++        return url.href.replace("blob:", "");
++      }
++    }
+     if (url.protocol == "data:") {
+       return url.href.match(/^data:[^;,]*/i)[0].replace(/:$/, ":text/plain");
+     }
diff --git a/PKGBUILD b/PKGBUILD
index c8893fcf784f..f5c434895c03 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ _pgo=true
 
 _pkgname=firefox
 pkgname=$_pkgname-kde-opensuse
-pkgver=117.0.1
+pkgver=118.0.2
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE"
 arch=('i686' 'x86_64')
@@ -65,8 +65,6 @@ provides=("firefox=${pkgver}")
 conflicts=('firefox')
 _patchrev=22b224bf3e8c1431d2d9d961ca351cf3c50fdc15
 options=('!emptydirs' !lto)
-_patchurl=https://raw.githubusercontent.com/openSUSE/firefox-maintenance/$_patchrev
-_repo=https://hg.mozilla.org/mozilla-unified
 source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
         mozconfig
         firefox.desktop
@@ -102,7 +100,8 @@ source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-
         0029-Shut-up-warnings-about-future-Rust-version-incompati.patch
         0030-Partially-revert-Bug-1768632-Make-EnumSet-compile-fo.patch
         0031-Bug-1796523-Workaround-source-locations-for-function.patch
-)
+        0032-Bug-1822730-Add-basic-blob-protocol-handling-for-blo.patch
+       )
 
 validpgpkeys=(
   # Mozilla Software Releases <release@mozilla.com>
@@ -127,7 +126,7 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
 _mozilla_api_key=e05d56db0a694edc8b5aaebda3f2db6a
 
 prepare() {
-  cd mozilla-unified
+  cd firefox-$pkgver
 
   cp "$srcdir/mozconfig" .mozconfig
 
@@ -148,7 +147,7 @@ prepare() {
 
 build() {
   #export CXXFLAGS="${CFLAGS}"
-  cd mozilla-unified
+  cd firefox-$pkgver
   export MOZ_SOURCE_REPO="$_repo"
   export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
   export MOZ_APP_REMOTINGNAME=$pkgname
@@ -208,7 +207,7 @@ package() {
     # gtk
     'libgtk-3.so'
   )
-  cd mozilla-unified
+  cd firefox-$pkgver
 
   [[ "$CARCH" == "i686" ]] && cp "$srcdir/kde.js" obj-i686-pc-linux-gnu/dist/bin/defaults/pref
   [[ "$CARCH" == "x86_64" ]] && cp "$srcdir/kde.js" obj-x86_64-pc-linux-gnu/dist/bin/defaults/pref
diff --git a/mozconfig b/mozconfig
index e5b0203a9650..91f6cbc09d55 100644
--- a/mozconfig
+++ b/mozconfig
@@ -1,10 +1,8 @@
-ac_add_options --enable-application=browser
-
-ac_add_options --prefix=/usr
-ac_add_options --enable-hardening
-ac_add_options --enable-optimize
-ac_add_options --enable-rust-simd
-ac_add_options --disable-bootstrap
+mk_add_options MOZILLA_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
+mk_add_options MOZ_MAKE_FLAGS=%{?jobs:-j%jobs}
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj
+. $topsrcdir/browser/config/mozconfig
 
 # Branding
 ac_add_options --enable-release
@@ -13,14 +11,25 @@ ac_add_options --enable-update-channel=release
 ac_add_options --with-distribution-id=org.archlinux
 ac_add_options --with-unsigned-addon-scopes=app,system
 ac_add_options --allow-addon-sideload
-export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
-export MOZ_SOURCE_REPO=https://hg.mozilla.org/mozilla-unified
-export MOZ_ADDON_SIGNING=1
-export MOZ_REQUIRE_SIGNING=1
-export BUILD_OFFICIAL=1
+
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+
+# Features
+ac_add_options --enable-jack
+ac_add_options --enable-alsa
+ac_add_options --enable-crashreporter
+ac_add_options --without-wasm-sandboxed-libraries
 
 
+# Optimisation
+ac_add_options --prefix=/usr
+ac_add_options --enable-hardening
+ac_add_options --enable-optimize
+ac_add_options --enable-rust-simd
+ac_add_options --disable-bootstrap
+ac_add_options --enable-lto
+
 # System libraries
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
@@ -41,17 +50,4 @@ ac_add_options --enable-necko-wifi
 ac_add_options --disable-libproxy
 #ac_add_options --enable-shared-js
 
-# Features
-ac_add_options --enable-jack
-ac_add_options --enable-alsa
-ac_add_options --enable-crashreporter
-
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-
-ac_add_options --without-wasm-sandboxed-libraries
-
 #STRIP_FLAGS="--strip-debug"
- 
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run'