Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemaage.org>:

 http/firefox/DEPENDS                                                         
                      |    2 
 http/firefox/DETAILS                                                         
                      |    4 
 http/firefox/HISTORY                                                         
                      |    5 
 http/firefox/patches/0004-bmo-847568-Support-system-harfbuzz.patch           
                      |    2 
 http/firefox/patches/0022-build-Disable-Werror.patch                         
                      |   31 ---
 
http/firefox/patches/0027-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
               |   52 +-----
 http/firefox/patches/0031-bmo-1762050-fix-pgo-with-virtualenv.patch          
                      |   86 ----------
 
http/firefox/patches/0031-bmo-1765361-resolve_objdir_from_virtualenv_if_mozinfo_not_ancestor.patch
 |   64 +++++++
 
http/firefox/patches/0032-bmo-1765361-resolve_objdir_from_virtualenv_if_mozinfo_not_ancestor.patch
 |   64 -------
 
http/firefox/patches/0033-bmo-1761691-fix_audio_thread_priority_when_dbus_is_disabled.patch
        |   27 ---
 rust-crates/cbindgen/DETAILS                                                 
                      |    6 
 rust-crates/cbindgen/HISTORY                                                 
                      |    3 
 12 files changed, 103 insertions(+), 243 deletions(-)

New commits:
commit a36f954a08bcb66c0b64938bb830c62cb04486c9
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

    http/firefox: version 101.0, SECURITY_PATCH++

commit 7532be4a9297fa972662db637b41b7a2ae3579bf
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

    rust-crates/cbindgen: version 0.23.0

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 0310626..020356a 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -35,7 +35,7 @@ depends  libwebp       "--with-system-webp"                 
     &&
 
 depends  nspr               "--with-system-nspr"                 &&
 
-local NSS_BRANCH="3.76"                                          &&
+local NSS_BRANCH="3.78"                                          &&
 if spell_ok nss                                                  &&
    is_version_less "$(installed_version nss)" "${NSS_BRANCH}"; then
   depends  -sub "${NSS_BRANCH}" nss  "--with-system-nss"
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 843d40a..eb78c9e 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
            SPELL=firefox
-         VERSION=100.0.2
-  SECURITY_PATCH=163
+         VERSION=101.0
+  SECURITY_PATCH=164
           SOURCE="${SPELL}-${VERSION}.source.tar.xz"
    
SOURCE_URL[0]="http://releases.mozilla.org/pub/${SPELL}/releases/${VERSION}/source/${SOURCE}";
          SOURCE2="${SOURCE}.asc"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 5a36986..30a8141 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2022-05-31 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: version 101.0, SECURITY_PATCH++
+       * DEPENDS: nss >= 3.78
+       * patches/*: updated
+
 2022-05-20 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 100.0.2, SECURITY_PATCH++, (CVE-2022-1802, 
CVE-2022-1529)
 
diff --git 
a/http/firefox/patches/0004-bmo-847568-Support-system-harfbuzz.patch 
b/http/firefox/patches/0004-bmo-847568-Support-system-harfbuzz.patch
index abcf190..37ecef5 100644
--- a/http/firefox/patches/0004-bmo-847568-Support-system-harfbuzz.patch
+++ b/http/firefox/patches/0004-bmo-847568-Support-system-harfbuzz.patch
@@ -113,7 +113,7 @@ index baa6f090a9..c51c36e2b4 100644
 +if CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
 +    CXXFLAGS += CONFIG["MOZ_HARFBUZZ_CFLAGS"]
 +
- if CONFIG["CC_TYPE"] == "clang":
+ if CONFIG["CC_TYPE"] in ("clang", "clang-cl"):
      # Suppress warnings from Skia header files.
      SOURCES["gfxPlatform.cpp"].flags += ["-Wno-implicit-fallthrough"]
 diff --git a/intl/unicharutil/util/moz.build 
b/intl/unicharutil/util/moz.build
diff --git a/http/firefox/patches/0022-build-Disable-Werror.patch 
b/http/firefox/patches/0022-build-Disable-Werror.patch
index f45ecb8..1e831ae 100644
--- a/http/firefox/patches/0022-build-Disable-Werror.patch
+++ b/http/firefox/patches/0022-build-Disable-Werror.patch
@@ -1,28 +1,13 @@
-From abc720ed6f0451e3f1c5ff9ae074ae02684306f7 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi AT gentoo.org>
-Date: Sat, 29 Aug 2020 22:06:15 +0200
-Subject: [PATCH 24/30] build: Disable -Werror
-
-Bug: https://bugzilla.mozilla.org/822978
-Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
----
- build/moz.configure/warnings.configure | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/build/moz.configure/warnings.configure 
b/build/moz.configure/warnings.configure
-index 0d925a9b80..2ac91626c4 100755
---- a/build/moz.configure/warnings.configure
-+++ b/build/moz.configure/warnings.configure
-@@ -216,7 +216,8 @@ with only_when(depends(target)(lambda t: t.kernel == 
"WINNT")):
- check_and_add_gcc_warning("-Wno-gnu-zero-variadic-macro-arguments")
+diff -Naur a/build/moz.configure/warnings.configure 
b/build/moz.configure/warnings.configure
+--- a/build/moz.configure/warnings.configure   2022-05-27 02:16:52.000000000 
+0300
++++ b/build/moz.configure/warnings.configure   2022-05-31 10:48:22.990378071 
+0300
+@@ -293,7 +293,8 @@
+ check_and_add_warning("-Wno-gnu-zero-variadic-macro-arguments")
  
  # Make it an error to be missing function declarations for C code.
--check_and_add_gcc_warning("-Werror=implicit-function-declaration", 
c_compiler)
-+check_and_add_gcc_warning("-Werror=implicit-function-declaration",
+-check_and_add_warning("-Werror=implicit-function-declaration", c_compiler)
++check_and_add_warning("-Werror=implicit-function-declaration",
 +                         when="--enable-warnings-as-errors")
  
  # New in clang 11. We can't really do anything about this warning.
- check_and_add_gcc_warning("-Wno-psabi")
--- 
-2.34.1
-
+ check_and_add_warning("-Wno-psabi")
diff --git 
a/http/firefox/patches/0027-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
 
b/http/firefox/patches/0027-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
index 130edc4..d356425 100644
--- 
a/http/firefox/patches/0027-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
+++ 
b/http/firefox/patches/0027-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
@@ -1,20 +1,6 @@
-From 2da8000880fe27908f1b18aba65a1b5e5f479cd8 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi AT gentoo.org>
-Date: Fri, 11 Dec 2020 15:46:25 +0100
-Subject: [PATCH 30/30] bmo#1663844: OpenH264: Allow using OpenH264 GMP 
decoder
- as fallback for video decoding
-
-Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
----
- dom/media/gmp/GMPSharedMemManager.h                   | 2 +-
- dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp | 2 +-
- dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp  | 2 ++
- 3 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/dom/media/gmp/GMPSharedMemManager.h 
b/dom/media/gmp/GMPSharedMemManager.h
-index 44c660f6ca..3a2eff3294 100644
---- a/dom/media/gmp/GMPSharedMemManager.h
-+++ b/dom/media/gmp/GMPSharedMemManager.h
+diff -up firefox-101.0/dom/media/gmp/GMPSharedMemManager.h.1663844 
firefox-101.0/dom/media/gmp/GMPSharedMemManager.h
+--- firefox-101.0/dom/media/gmp/GMPSharedMemManager.h.1663844  2022-05-27 
01:16:53.000000000 +0200
++++ firefox-101.0/dom/media/gmp/GMPSharedMemManager.h  2022-05-30 
21:15:20.989993419 +0200
 @@ -27,7 +27,7 @@ class GMPSharedMem {
    // returned to the parent pool (which is not included).  If more than
    // this are needed, we presume the client has either crashed or hung
@@ -24,24 +10,21 @@ index 44c660f6ca..3a2eff3294 100644
  
    GMPSharedMem() {
      for (size_t i = 0; i < sizeof(mGmpAllocated) / sizeof(mGmpAllocated[0]);
-diff --git a/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp 
b/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp
-index 641f52a58b..6bd8235073 100644
---- a/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp
-+++ b/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp
-@@ -82,7 +82,7 @@ bool GMPDecoderModule::SupportsMimeType(const nsACString& 
aMimeType,
+diff -up 
firefox-101.0/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp.1663844 
firefox-101.0/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp
+--- 
firefox-101.0/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp.1663844   
     2022-05-30 21:15:20.989993419 +0200
++++ firefox-101.0/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp      
  2022-05-30 21:24:16.615282035 +0200
+@@ -66,6 +66,7 @@ media::DecodeSupportSet GMPDecoderModule
  
- bool GMPDecoderModule::SupportsMimeType(
-     const nsACString& aMimeType, DecoderDoctorDiagnostics* aDiagnostics) 
const {
--  return false;
-+  return MP4Decoder::IsH264(aMimeType);
- }
+   nsCString api = nsLiteralCString(CHROMIUM_CDM_API);
  
- /* static */
-diff --git a/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp 
b/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
-index c73bf38be6..0d521d5d7b 100644
---- a/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
-+++ b/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
-@@ -69,6 +69,8 @@ void GMPVideoDecoder::Decoded(GMPVideoi420Frame* 
aDecodedFrame) {
++  // TODO: Do we enable it here?
+   if (MP4Decoder::IsH264(aMimeType)) {
+     isSupported = HaveGMPFor(api, {"h264"_ns, aGMP.value()});
+   } else if (VPXDecoder::IsVP9(aMimeType)) {
+diff -up 
firefox-101.0/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp.1663844 
firefox-101.0/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
+--- 
firefox-101.0/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp.1663844 
2022-05-27 01:16:53.000000000 +0200
++++ firefox-101.0/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp 
2022-05-30 21:15:20.989993419 +0200
+@@ -70,6 +70,8 @@ void GMPVideoDecoder::Decoded(GMPVideoi4
    RefPtr<GMPVideoDecoder> self = this;
    if (v) {
      mDecodedData.AppendElement(std::move(v));
@@ -50,6 +33,3 @@ index c73bf38be6..0d521d5d7b 100644
    } else {
      mDecodedData.Clear();
      mDecodePromise.RejectIfExists(
--- 
-2.34.1
-
diff --git 
a/http/firefox/patches/0031-bmo-1762050-fix-pgo-with-virtualenv.patch 
b/http/firefox/patches/0031-bmo-1762050-fix-pgo-with-virtualenv.patch
deleted file mode 100644
index 932cf7a..0000000
--- a/http/firefox/patches/0031-bmo-1762050-fix-pgo-with-virtualenv.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/python/mozbuild/mozbuild/build_commands.py 
b/python/mozbuild/mozbuild/build_commands.py
---- a/python/mozbuild/mozbuild/build_commands.py
-+++ b/python/mozbuild/mozbuild/build_commands.py
-@@ -183,10 +183,11 @@
-             directory=directory,
-             verbose=verbose,
-             keep_going=keep_going,
-             mach_context=command_context._mach_context,
-             append_env=append_env,
-+            virtualenv_topobjdir=orig_topobjdir,
-         )
-         if status != 0:
-             return status
- 
-         # Packaging the instrumented build is required to get the jarlog
-@@ -206,11 +207,11 @@
-             pgo_env["LLVM_PROFDATA"] = instr.config_environment.substs.get(
-                 "LLVM_PROFDATA"
-             )
-         pgo_env["JARLOG_FILE"] = mozpath.join(orig_topobjdir, 
"jarlog/en-US.log")
-         pgo_cmd = [
--            instr.virtualenv_manager.python_path,
-+            command_context.virtualenv_manager.python_path,
-             mozpath.join(command_context.topsrcdir, 
"build/pgo/profileserver.py"),
-         ]
-         subprocess.check_call(pgo_cmd, cwd=instr.topobjdir, env=pgo_env)
- 
-         # Set the default build to MOZ_PROFILE_USE
-diff --git a/python/mozbuild/mozbuild/controller/building.py 
b/python/mozbuild/mozbuild/controller/building.py
---- a/python/mozbuild/mozbuild/controller/building.py
-+++ b/python/mozbuild/mozbuild/controller/building.py
-@@ -1220,10 +1220,11 @@
-         directory=None,
-         verbose=False,
-         keep_going=False,
-         mach_context=None,
-         append_env=None,
-+        virtualenv_topobjdir=None,
-     ):
-         """Invoke the build backend.
- 
-         ``what`` defines the thing to build. If not defined, the default
-         target is used.
-@@ -1297,10 +1298,11 @@
-                 config_rc = self.configure(
-                     metrics,
-                     buildstatus_messages=True,
-                     line_handler=output.on_line,
-                     append_env=append_env,
-+                    virtualenv_topobjdir=virtualenv_topobjdir,
-                 )
- 
-                 if config_rc != 0:
-                     return config_rc
- 
-@@ -1635,10 +1637,11 @@
-         metrics,
-         options=None,
-         buildstatus_messages=False,
-         line_handler=None,
-         append_env=None,
-+        virtualenv_topobjdir=None,
-     ):
-         # Disable indexing in objdir because it is not necessary and can 
slow
-         # down builds.
-         self.metrics = metrics
-         mkdir(self.topobjdir, not_indexed=True)
-@@ -1658,15 +1661,16 @@
-             if line.startswith("export "):
-                 k, eq, v = line[len("export ") :].partition("=")
-                 if eq == "=":
-                     append_env[k] = v
- 
-+        virtualenv_topobjdir = virtualenv_topobjdir or self.topobjdir
-         build_site = CommandSiteManager.from_environment(
-             self.topsrcdir,
-             lambda: get_state_dir(specific_to_topsrcdir=True, 
topsrcdir=self.topsrcdir),
-             "build",
--            os.path.join(self.topobjdir, "_virtualenvs"),
-+            os.path.join(virtualenv_topobjdir, "_virtualenvs"),
-         )
-         build_site.ensure()
- 
-         command = [build_site.python_path, os.path.join(self.topsrcdir, 
"configure.py")]
-         if options:
-
diff --git 
a/http/firefox/patches/0031-bmo-1765361-resolve_objdir_from_virtualenv_if_mozinfo_not_ancestor.patch
 
b/http/firefox/patches/0031-bmo-1765361-resolve_objdir_from_virtualenv_if_mozinfo_not_ancestor.patch
new file mode 100644
index 0000000..1b0a98a
--- /dev/null
+++ 
b/http/firefox/patches/0031-bmo-1765361-resolve_objdir_from_virtualenv_if_mozinfo_not_ancestor.patch
@@ -0,0 +1,64 @@
+
+# HG changeset patch
+# User Mitchell Hentges <mhentges AT mozilla.com>
+# Date 1650979968 0
+# Node ID f05729424f4d67217eac2909844debd4b7e1dc27
+# Parent  339a9e0b4903ccc822974d2e8d04212ae1ecfe77
+Bug 1765361: Only resolve objdir from virtualenv if mozinfo not ancestor 
r=glandium
+
+Virtualenv-based objdir detection doesn't work for instrumented builds,
+as instrumentation-specific objdirs aren't created.
+
+Resolve this by:
+* Removing redundant cwd-based topsrcdir resolution - the
+  `__file__`-based code path below covers this case.
+* Only using virtualenv-based resolving if topsrcdir isn't resolved.
+* Documenting that virtualenv-based resolution is problematic for
+  instrumented builds.
+
+Differential Revision: https://phabricator.services.mozilla.com/D144030
+
+diff --git a/python/mozbuild/mozbuild/base.py 
b/python/mozbuild/mozbuild/base.py
+--- a/python/mozbuild/mozbuild/base.py
++++ b/python/mozbuild/mozbuild/base.py
+@@ -181,29 +181,26 @@ class MozbuildObject(ProcessExecutionMix
+ 
+         for dir_path in ancestors(cwd):
+             # If we find a mozinfo.json, we are in the objdir.
+             mozinfo_path = os.path.join(dir_path, "mozinfo.json")
+             if os.path.isfile(mozinfo_path):
+                 topsrcdir, topobjdir, mozconfig = load_mozinfo(mozinfo_path)
+                 break
+ 
+-            # We choose an arbitrary file as an indicator that this is a
+-            # srcdir. We go with ourself because why not!
+-            our_path = os.path.join(
+-                dir_path, "python", "mozbuild", "mozbuild", "base.py"
+-            )
+-            if os.path.isfile(our_path):
+-                topsrcdir = dir_path
+-                break
+-
+-        # See if we're running from a Python virtualenv that's inside an 
objdir.
+-        mozinfo_path = os.path.join(os.path.dirname(sys.prefix), 
"../mozinfo.json")
+-        if detect_virtualenv_mozinfo and os.path.isfile(mozinfo_path):
+-            topsrcdir, topobjdir, mozconfig = load_mozinfo(mozinfo_path)
++        if not topsrcdir:
++            # See if we're running from a Python virtualenv that's inside 
an objdir.
++            # sys.prefix would look like 
"$objdir/_virtualenvs/$virtualenv/".
++            # Note that virtualenv-based objdir detection work for 
instrumented builds,
++            # because they aren't created in the scoped "instrumentated" 
objdir.
++            # However, working-directory-ancestor-based objdir resolution 
should fully
++            # cover that case.
++            mozinfo_path = os.path.join(sys.prefix, "..", "..", 
"mozinfo.json")
++            if detect_virtualenv_mozinfo and os.path.isfile(mozinfo_path):
++                topsrcdir, topobjdir, mozconfig = load_mozinfo(mozinfo_path)
+ 
+         if not topsrcdir:
+             topsrcdir = os.path.abspath(
+                 os.path.join(os.path.dirname(__file__), "..", "..", "..")
+             )
+ 
+         topsrcdir = mozpath.normsep(topsrcdir)
+         if topobjdir:
+
diff --git 
a/http/firefox/patches/0032-bmo-1765361-resolve_objdir_from_virtualenv_if_mozinfo_not_ancestor.patch
 
b/http/firefox/patches/0032-bmo-1765361-resolve_objdir_from_virtualenv_if_mozinfo_not_ancestor.patch
deleted file mode 100644
index 1b0a98a..0000000
--- 
a/http/firefox/patches/0032-bmo-1765361-resolve_objdir_from_virtualenv_if_mozinfo_not_ancestor.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-
-# HG changeset patch
-# User Mitchell Hentges <mhentges AT mozilla.com>
-# Date 1650979968 0
-# Node ID f05729424f4d67217eac2909844debd4b7e1dc27
-# Parent  339a9e0b4903ccc822974d2e8d04212ae1ecfe77
-Bug 1765361: Only resolve objdir from virtualenv if mozinfo not ancestor 
r=glandium
-
-Virtualenv-based objdir detection doesn't work for instrumented builds,
-as instrumentation-specific objdirs aren't created.
-
-Resolve this by:
-* Removing redundant cwd-based topsrcdir resolution - the
-  `__file__`-based code path below covers this case.
-* Only using virtualenv-based resolving if topsrcdir isn't resolved.
-* Documenting that virtualenv-based resolution is problematic for
-  instrumented builds.
-
-Differential Revision: https://phabricator.services.mozilla.com/D144030
-
-diff --git a/python/mozbuild/mozbuild/base.py 
b/python/mozbuild/mozbuild/base.py
---- a/python/mozbuild/mozbuild/base.py
-+++ b/python/mozbuild/mozbuild/base.py
-@@ -181,29 +181,26 @@ class MozbuildObject(ProcessExecutionMix
- 
-         for dir_path in ancestors(cwd):
-             # If we find a mozinfo.json, we are in the objdir.
-             mozinfo_path = os.path.join(dir_path, "mozinfo.json")
-             if os.path.isfile(mozinfo_path):
-                 topsrcdir, topobjdir, mozconfig = load_mozinfo(mozinfo_path)
-                 break
- 
--            # We choose an arbitrary file as an indicator that this is a
--            # srcdir. We go with ourself because why not!
--            our_path = os.path.join(
--                dir_path, "python", "mozbuild", "mozbuild", "base.py"
--            )
--            if os.path.isfile(our_path):
--                topsrcdir = dir_path
--                break
--
--        # See if we're running from a Python virtualenv that's inside an 
objdir.
--        mozinfo_path = os.path.join(os.path.dirname(sys.prefix), 
"../mozinfo.json")
--        if detect_virtualenv_mozinfo and os.path.isfile(mozinfo_path):
--            topsrcdir, topobjdir, mozconfig = load_mozinfo(mozinfo_path)
-+        if not topsrcdir:
-+            # See if we're running from a Python virtualenv that's inside 
an objdir.
-+            # sys.prefix would look like 
"$objdir/_virtualenvs/$virtualenv/".
-+            # Note that virtualenv-based objdir detection work for 
instrumented builds,
-+            # because they aren't created in the scoped "instrumentated" 
objdir.
-+            # However, working-directory-ancestor-based objdir resolution 
should fully
-+            # cover that case.
-+            mozinfo_path = os.path.join(sys.prefix, "..", "..", 
"mozinfo.json")
-+            if detect_virtualenv_mozinfo and os.path.isfile(mozinfo_path):
-+                topsrcdir, topobjdir, mozconfig = load_mozinfo(mozinfo_path)
- 
-         if not topsrcdir:
-             topsrcdir = os.path.abspath(
-                 os.path.join(os.path.dirname(__file__), "..", "..", "..")
-             )
- 
-         topsrcdir = mozpath.normsep(topsrcdir)
-         if topobjdir:
-
diff --git 
a/http/firefox/patches/0033-bmo-1761691-fix_audio_thread_priority_when_dbus_is_disabled.patch
 
b/http/firefox/patches/0033-bmo-1761691-fix_audio_thread_priority_when_dbus_is_disabled.patch
deleted file mode 100644
index 58b271c..0000000
--- 
a/http/firefox/patches/0033-bmo-1761691-fix_audio_thread_priority_when_dbus_is_disabled.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-
-diff --git a/toolkit/library/rust/shared/Cargo.toml 
b/toolkit/library/rust/shared/Cargo.toml
---- a/toolkit/library/rust/shared/Cargo.toml
-+++ b/toolkit/library/rust/shared/Cargo.toml
-@@ -38,17 +38,17 @@ log = {version = "0.4", features = ["rel
- cose-c = { version = "0.1.5" }
- jsrust_shared = { path = "../../../../js/src/rust/shared" }
- cascade_bloom_filter = { path = "../../../components/cascade_bloom_filter" }
- cert_storage = { path = "../../../../security/manager/ssl/cert_storage" }
- bitsdownload = { path = "../../../components/bitsdownload", optional = true 
}
- storage = { path = "../../../../storage/rust" }
- bookmark_sync = { path = "../../../components/places/bookmark_sync", 
optional = true }
- chardetng_c = "0.1.1"
--audio_thread_priority = { version = "0.26.1" }
-+audio_thread_priority = { version = "0.26.1", default_features = false, 
features = ["winapi"] }
- mdns_service = { 
path="../../../../dom/media/webrtc/transport/mdns_service", optional = true }
- neqo_glue = { path = "../../../../netwerk/socket/neqo_glue" }
- wgpu_bindings = { path = "../../../../gfx/wgpu_bindings" }
- mapped_hyph = { git = "https://github.com/jfkthame/mapped_hyph.git";, rev = 
"746743227485a83123784df0c53227ab466612ed" }
- fog_control = { path = "../../../components/glean" }
- app_services_logger = { path = 
"../../../../services/common/app_services_logger" }
- http_sfv = { path = "../../../../netwerk/base/http-sfv" }
- unic-langid = { version = "0.9", features = ["likelysubtags"] }
-
-
-
-
diff --git a/rust-crates/cbindgen/DETAILS b/rust-crates/cbindgen/DETAILS
index 289f378..b3170bc 100755
--- a/rust-crates/cbindgen/DETAILS
+++ b/rust-crates/cbindgen/DETAILS
@@ -4,7 +4,7 @@ if [[ "${CBINDGEN_BRANCH}" == "scm" ]]; then
          VERSION="$(get_scm_version)"
           SOURCE="${SPELL}-git.tar.bz2"
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
-      SOURCE_URL="git://github.com/eqrion/${SPELL}:${SPELL}-git"
+      SOURCE_URL="git_http://github.com/eqrion/${SPELL}:${SPELL}-git";
    SOURCE_IGNORE="volatile"
   FORCE_DOWNLOAD="on"
 else
@@ -16,10 +16,10 @@ else
 #
 # With the non-scm branch, we want offline builds.
 #
-         VERSION="0.20.0"
+         VERSION="0.23.0"
           SOURCE="${SPELL}-${VERSION}.tar.gz"
          SOURCE2="${SPELL}-0.18.0-cargo.tar.gz"
-     
SOURCE_HASH="sha512:19784e9bb13a540ed8f41d92bbe8aeaad1af9b04ce583d1ea4da3c914ff4799b77f2a4cb2c32b2166829576a7fd51d5f5e6ab707e612d6af15cde51b6fa293c1"
+     
SOURCE_HASH="sha512:341071b20bfcf5cca667f20473b690e9f16109edb519ce3ff263078e246db4d4d99d2ed6a51c6914755d3e554d28d523b78819c4b9eb4f5a396274a072e70da8"
     
SOURCE2_HASH="sha512:c73539301c29ecc2dccf2d5bd96afc18d04ee6f5ef8b8df3c0217bf514c857a1e8ca6dbf00175bdbd0c63ad939b618472a3893e2d3d025ab47071844432d0b20"
    
SOURCE_URL[0]="https://github.com/eqrion/${SPELL}/archive/v${VERSION}.tar.gz";
    SOURCE2_URL[0]="https://smgl.bandrate.org/${SOURCE2}";
diff --git a/rust-crates/cbindgen/HISTORY b/rust-crates/cbindgen/HISTORY
index 1293f44..fe9a6b4 100644
--- a/rust-crates/cbindgen/HISTORY
+++ b/rust-crates/cbindgen/HISTORY
@@ -1,3 +1,6 @@
+2022-05-31 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: version 0.23.0, git -> git_http
+
 2021-08-11 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 0.20.0