Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (c3ce2706fa87791cfb06a277decc483a51fcf2eb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (c3ce2706fa87791cfb06a277decc483a51fcf2eb)
  • Date: Tue, 23 Aug 2022 19:47:56 +0000

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

http/firefox/DEPENDS
| 2
http/firefox/DETAILS
| 4
http/firefox/HISTORY
| 5
http/firefox/patches/0030-bmo-1754469-memory_mozalloc_throw.patch
| 69 ++++++
http/firefox/patches/0031-bmo-1769631-python-3.11-compatibility.patch
| 30 ++

http/firefox/patches/0032-bmo-1773336-disable_audio_thread_priority_default_features.patch
| 45 +++
http/firefox/patches/0032-p05-bmo-1776724-build-wayland-only-D150485.patch
| 115 ----------
http/firefox/patches/0033-bmo-1754469-memory_mozalloc_throw.patch
| 69 ------
http/firefox/patches/0033-rhbz-2115253-vaapi-fixes.patch
| 20 +
http/firefox/patches/0034-bgo-860033-firefox-wayland-no-dbus.patch
| 49 ++++
http/firefox/patches/0034-bmo-1769631-python-3.11-compatibility.patch
| 30 --

http/firefox/patches/0035-bmo-1773336-disable_audio_thread_priority_default_features.patch
| 45 ---
http/firefox/patches/0036-vaapi-fixes.patch
| 18 -
http/firefox/patches/0037-bgo-860033-firefox-wayland-no-remote.patch
| 55 ----
14 files changed, 221 insertions(+), 335 deletions(-)

New commits:
commit c3ce2706fa87791cfb06a277decc483a51fcf2eb
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

http/firefox: version 104.0, SECURITY_PATCH++

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index e7a14ee..caf134a 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -40,7 +40,7 @@ depends libwebp "--with-system-webp"
&&

depends nspr "--with-system-nspr" &&

-local NSS_BRANCH="3.80" &&
+local NSS_BRANCH="3.81" &&
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 09f4f3a..63fa776 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
SPELL=firefox
- VERSION=103.0.2
- SECURITY_PATCH=166
+ VERSION=104.0
+ SECURITY_PATCH=167
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 dd7f45b..c3f8fea 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2022-08-23 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 104.0, SECURITY_PATCH++
+ * DEPENDS: nss >= 3.81
+ * patches/*: updated
+
2022-08-09 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 103.0.2

diff --git
a/http/firefox/patches/0030-bmo-1754469-memory_mozalloc_throw.patch
b/http/firefox/patches/0030-bmo-1754469-memory_mozalloc_throw.patch
new file mode 100644
index 0000000..634892be
--- /dev/null
+++ b/http/firefox/patches/0030-bmo-1754469-memory_mozalloc_throw.patch
@@ -0,0 +1,69 @@
+--- a/memory/mozalloc/throw_gcc.h 2022-02-02 17:33:38 UTC
++++ b/memory/mozalloc/throw_gcc.h
+@@ -74,50 +74,66 @@ __throw_bad_function_call(void) {
+ mozalloc_abort("fatal: STL threw bad_function_call");
+ }
+
++#if !defined(_LIBCPP_VERSION)
+ MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void
__throw_logic_error(
+ const char* msg) {
+ mozalloc_abort(msg);
+ }
++#endif // _LIBCPP_VERSION
+
++#if !defined(_LIBCPP_VERSION)
+ MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void
__throw_domain_error(
+ const char* msg) {
+ mozalloc_abort(msg);
+ }
++#endif // _LIBCPP_VERSION
+
++#if !defined(_LIBCPP_VERSION)
+ MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void
+ __throw_invalid_argument(const char* msg) {
+ mozalloc_abort(msg);
+ }
++#endif // _LIBCPP_VERSION
+
++#if !defined(_LIBCPP_VERSION)
+ MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void
__throw_length_error(
+ const char* msg) {
+ mozalloc_abort(msg);
+ }
++#endif // _LIBCPP_VERSION
+
++#if !defined(_LIBCPP_VERSION)
+ MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void
__throw_out_of_range(
+ const char* msg) {
+ mozalloc_abort(msg);
+ }
++#endif // _LIBCPP_VERSION
+
+ MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void
__throw_runtime_error(
+ const char* msg) {
+ mozalloc_abort(msg);
+ }
+
++#if !defined(_LIBCPP_VERSION)
+ MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void
__throw_range_error(
+ const char* msg) {
+ mozalloc_abort(msg);
+ }
++#endif // _LIBCPP_VERSION
+
++#if !defined(_LIBCPP_VERSION)
+ MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void
+ __throw_overflow_error(const char* msg) {
+ mozalloc_abort(msg);
+ }
++#endif // _LIBCPP_VERSION
+
++#if !defined(_LIBCPP_VERSION)
+ MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void
+ __throw_underflow_error(const char* msg) {
+ mozalloc_abort(msg);
+ }
++#endif // _LIBCPP_VERSION
+
+ MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void
__throw_ios_failure(
+ const char* msg) {
diff --git
a/http/firefox/patches/0031-bmo-1769631-python-3.11-compatibility.patch
b/http/firefox/patches/0031-bmo-1769631-python-3.11-compatibility.patch
new file mode 100644
index 0000000..97ac3ce
--- /dev/null
+++ b/http/firefox/patches/0031-bmo-1769631-python-3.11-compatibility.patch
@@ -0,0 +1,30 @@
+#
https://src.fedoraproject.org/rpms/firefox/c/4d45de9bff7b7ef01f7d3c9e53a61adc9cf3ce9e?branch=4d45de9bff7b7ef01f7d3c9e53a61adc9cf3ce9e
+
+diff -up firefox-102.0/xpcom/idl-parser/xpidl/xpidl.py.build-python-3.11
firefox-102.0/xpcom/idl-parser/xpidl/xpidl.py
+--- firefox-102.0/xpcom/idl-parser/xpidl/xpidl.py.build-python-3.11
2022-06-23 09:10:31.000000000 +0200
++++ firefox-102.0/xpcom/idl-parser/xpidl/xpidl.py 2022-07-15
16:18:52.048351493 +0200
+@@ -1572,13 +1572,13 @@ class IDLParser(object):
+ t_ignore = " \t"
+
+ def t_multilinecomment(self, t):
+- r"/\*(?s).*?\*/"
++ r"/\*(?s:.)*?\*/"
+ t.lexer.lineno += t.value.count("\n")
+ if t.value.startswith("/**"):
+ self._doccomments.append(t.value)
+
+ def t_singlelinecomment(self, t):
+- r"(?m)//.*?$"
++ r"(?m://.*?$)"
+
+ def t_IID(self, t):
+ return t
+@@ -1591,7 +1591,7 @@ class IDLParser(object):
+ return t
+
+ def t_LCDATA(self, t):
+- r"(?s)%\{[ ]*C\+\+[ ]*\n(?P<cdata>.*?\n?)%\}[ ]*(C\+\+)?"
++ r"(?s:%\{[ ]*C\+\+[ ]*\n(?P<cdata>.*?\n?)%\}[ ]*(C\+\+)?)"
+ t.type = "CDATA"
+ t.value = t.lexer.lexmatch.group("cdata")
+ t.lexer.lineno += t.value.count("\n")
diff --git
a/http/firefox/patches/0032-bmo-1773336-disable_audio_thread_priority_default_features.patch

b/http/firefox/patches/0032-bmo-1773336-disable_audio_thread_priority_default_features.patch
new file mode 100644
index 0000000..4f96eae
--- /dev/null
+++
b/http/firefox/patches/0032-bmo-1773336-disable_audio_thread_priority_default_features.patch
@@ -0,0 +1,45 @@
+From 64d822a598f46f9d08a41eab6a7d416a6c54927b Mon Sep 17 00:00:00 2001
+From: Mike Hommey <mh AT glandium.org>
+Date: Wed, 8 Jun 2022 16:03:49 +0900
+Subject: [PATCH] Disable audio_thread_priority default features
+
+with_dbus is supposed to be optional in gecko, but in practice, the
+audio_thread_priority defaults force it on.
+# https://github.com/kinetiknz/audioipc/pull/5/
+---
+ audioipc/Cargo.toml | 1 +
+ client/Cargo.toml | 1 +
+ server/Cargo.toml | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/third_party/rust/audioipc/Cargo.toml
b/third_party/rust/audioipc/Cargo.toml
+index d69c56d..8a9dd3d 100644
+--- a/third_party/rust/audioipc/Cargo.toml
++++ b/third_party/rust/audioipc/Cargo.toml
+@@ -30,6 +30,7 @@ memmap2 = "0.2"
+
+ [target.'cfg(target_os = "linux")'.dependencies.audio_thread_priority]
+ version = "0.26.1"
++default-features = false
+
+ [target.'cfg(windows)'.dependencies]
+ mio = "0.6.19"
+diff --git a/third_party/rust/audioipc-client/Cargo.toml
b/third_party/rust/audioipc-client/Cargo.toml
+index 3ffb268..5dbf5f6 100644
+--- a/third_party/rust/audioipc-client/Cargo.toml
++++ b/third_party/rust/audioipc-client/Cargo.toml
+@@ -19,3 +19,4 @@ tokio = { version="0.1", default-features=false, features
= ["rt-full"] }
+
+ [dependencies.audio_thread_priority]
+ version = "0.26.1"
++default-features = false
+diff --git a/third_party/rust/audioipc-server/Cargo.toml
b/third_party/rust/audioipc-server/Cargo.toml
+index 2c82fbf..b2b710c 100644
+--- a/third_party/rust/audioipc-server/Cargo.toml
++++ b/third_party/rust/audioipc-server/Cargo.toml
+@@ -24,3 +24,4 @@ default-features = false
+
+ [dependencies.audio_thread_priority]
+ version = "0.26.1"
++default-features = false
+
diff --git
a/http/firefox/patches/0032-p05-bmo-1776724-build-wayland-only-D150485.patch
b/http/firefox/patches/0032-p05-bmo-1776724-build-wayland-only-D150485.patch
deleted file mode 100644
index 1c27926..0000000
---
a/http/firefox/patches/0032-p05-bmo-1776724-build-wayland-only-D150485.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff --git a/gfx/gl/GLContextProviderEGL.cpp
b/gfx/gl/GLContextProviderEGL.cpp
---- a/gfx/gl/GLContextProviderEGL.cpp
-+++ b/gfx/gl/GLContextProviderEGL.cpp
-@@ -77,10 +77,11 @@
- #if defined(MOZ_WIDGET_GTK)
- # include "mozilla/widget/GtkCompositorWidget.h"
- # if defined(MOZ_WAYLAND)
- # include <gdk/gdkwayland.h>
- # include <wayland-egl.h>
-+# include "mozilla/WidgetUtilsGtk.h"
- # include "mozilla/widget/nsWaylandDisplay.h"
- # endif
- #endif
-
- struct wl_egl_window;
-diff --git a/gfx/gl/GLContextProviderLinux.cpp
b/gfx/gl/GLContextProviderLinux.cpp
---- a/gfx/gl/GLContextProviderLinux.cpp
-+++ b/gfx/gl/GLContextProviderLinux.cpp
-@@ -11,49 +11,59 @@
- namespace mozilla::gl {
-
- using namespace mozilla::gfx;
- using namespace mozilla::widget;
-
-+#ifdef MOZ_X11
- static class GLContextProviderGLX sGLContextProviderGLX;
-+#endif
- static class GLContextProviderEGL sGLContextProviderEGL;
-
- already_AddRefed<GLContext>
GLContextProviderLinux::CreateForCompositorWidget(
- CompositorWidget* aCompositorWidget, bool aHardwareWebRender,
- bool aForceAccelerated) {
- if (gfxVars::UseEGL()) {
- return sGLContextProviderEGL.CreateForCompositorWidget(
- aCompositorWidget, aHardwareWebRender, aForceAccelerated);
-+#ifdef MOZ_X11
- } else {
- return sGLContextProviderGLX.CreateForCompositorWidget(
- aCompositorWidget, aHardwareWebRender, aForceAccelerated);
-+#endif
- }
- }
-
- /*static*/
- already_AddRefed<GLContext> GLContextProviderLinux::CreateHeadless(
- const GLContextCreateDesc& desc, nsACString* const out_failureId) {
- if (gfxVars::UseEGL()) {
- return sGLContextProviderEGL.CreateHeadless(desc, out_failureId);
-+#ifdef MOZ_X11
- } else {
- return sGLContextProviderGLX.CreateHeadless(desc, out_failureId);
-+#endif
- }
- }
-
- /*static*/
- GLContext* GLContextProviderLinux::GetGlobalContext() {
- if (gfxVars::UseEGL()) {
- return sGLContextProviderEGL.GetGlobalContext();
-+#ifdef MOZ_X11
- } else {
- return sGLContextProviderGLX.GetGlobalContext();
-+#endif
- }
- }
-
- /*static*/
- void GLContextProviderLinux::Shutdown() {
- if (gfxVars::UseEGL()) {
- sGLContextProviderEGL.Shutdown();
-+#ifdef MOZ_X11
- } else {
- sGLContextProviderGLX.Shutdown();
-+#endif
- }
- }
-
- } // namespace mozilla::gl
-diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build
---- a/gfx/gl/moz.build
-+++ b/gfx/gl/moz.build
-@@ -105,14 +105,15 @@
-
- elif gl_provider == "Linux":
- # GLContextProviderGLX.cpp needs to be kept out of UNIFIED_SOURCES
- # as it includes X11 headers which cause conflicts.
- SOURCES += [
-- "GLContextProviderGLX.cpp",
- "GLContextProviderLinux.cpp",
- ]
- EXPORTS += ["GLContextGLX.h", "GLXLibrary.h"]
-+ if CONFIG["MOZ_X11"]:
-+ SOURCES += ["GLContextProviderGLX.cpp"]
-
- if CONFIG["MOZ_WAYLAND"]:
- SOURCES += ["SharedSurfaceDMABUF.cpp"]
-
- UNIFIED_SOURCES += [
-diff --git a/gfx/thebes/gfxPlatformGtk.cpp b/gfx/thebes/gfxPlatformGtk.cpp
---- a/gfx/thebes/gfxPlatformGtk.cpp
-+++ b/gfx/thebes/gfxPlatformGtk.cpp
-@@ -991,11 +991,11 @@
- }
-
- RefPtr<VsyncSource> softwareVsync = new XrandrSoftwareVsyncSource();
- return softwareVsync.forget();
- #else
-- return CreateSoftwareVsyncSource();
-+ return GetSoftwareVsyncSource();
- #endif
- }
-
- void gfxPlatformGtk::BuildContentDeviceData(ContentDeviceData* aOut) {
- gfxPlatform::BuildContentDeviceData(aOut);
-
diff --git
a/http/firefox/patches/0033-bmo-1754469-memory_mozalloc_throw.patch
b/http/firefox/patches/0033-bmo-1754469-memory_mozalloc_throw.patch
deleted file mode 100644
index 634892be..0000000
--- a/http/firefox/patches/0033-bmo-1754469-memory_mozalloc_throw.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- a/memory/mozalloc/throw_gcc.h 2022-02-02 17:33:38 UTC
-+++ b/memory/mozalloc/throw_gcc.h
-@@ -74,50 +74,66 @@ __throw_bad_function_call(void) {
- mozalloc_abort("fatal: STL threw bad_function_call");
- }
-
-+#if !defined(_LIBCPP_VERSION)
- MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void
__throw_logic_error(
- const char* msg) {
- mozalloc_abort(msg);
- }
-+#endif // _LIBCPP_VERSION
-
-+#if !defined(_LIBCPP_VERSION)
- MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void
__throw_domain_error(
- const char* msg) {
- mozalloc_abort(msg);
- }
-+#endif // _LIBCPP_VERSION
-
-+#if !defined(_LIBCPP_VERSION)
- MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void
- __throw_invalid_argument(const char* msg) {
- mozalloc_abort(msg);
- }
-+#endif // _LIBCPP_VERSION
-
-+#if !defined(_LIBCPP_VERSION)
- MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void
__throw_length_error(
- const char* msg) {
- mozalloc_abort(msg);
- }
-+#endif // _LIBCPP_VERSION
-
-+#if !defined(_LIBCPP_VERSION)
- MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void
__throw_out_of_range(
- const char* msg) {
- mozalloc_abort(msg);
- }
-+#endif // _LIBCPP_VERSION
-
- MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void
__throw_runtime_error(
- const char* msg) {
- mozalloc_abort(msg);
- }
-
-+#if !defined(_LIBCPP_VERSION)
- MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void
__throw_range_error(
- const char* msg) {
- mozalloc_abort(msg);
- }
-+#endif // _LIBCPP_VERSION
-
-+#if !defined(_LIBCPP_VERSION)
- MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void
- __throw_overflow_error(const char* msg) {
- mozalloc_abort(msg);
- }
-+#endif // _LIBCPP_VERSION
-
-+#if !defined(_LIBCPP_VERSION)
- MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void
- __throw_underflow_error(const char* msg) {
- mozalloc_abort(msg);
- }
-+#endif // _LIBCPP_VERSION
-
- MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void
__throw_ios_failure(
- const char* msg) {
diff --git a/http/firefox/patches/0033-rhbz-2115253-vaapi-fixes.patch
b/http/firefox/patches/0033-rhbz-2115253-vaapi-fixes.patch
new file mode 100644
index 0000000..ddf30d1
--- /dev/null
+++ b/http/firefox/patches/0033-rhbz-2115253-vaapi-fixes.patch
@@ -0,0 +1,20 @@
+diff -up firefox-104.0/gfx/thebes/gfxPlatformGtk.cpp.firefox-enable-vaapi
firefox-104.0/gfx/thebes/gfxPlatformGtk.cpp
+diff -up firefox-104.0/widget/gtk/GfxInfo.cpp.firefox-enable-vaapi
firefox-104.0/widget/gtk/GfxInfo.cpp
+--- firefox-104.0/widget/gtk/GfxInfo.cpp.firefox-enable-vaapi 2022-08-16
15:14:53.014042400 +0200
++++ firefox-104.0/widget/gtk/GfxInfo.cpp 2022-08-16 15:15:30.482301677
+0200
+@@ -873,15 +873,6 @@ const nsTArray<GfxDriverInfo>& GfxInfo::
+ nsIGfxInfo::FEATURE_BLOCKED_DEVICE, DRIVER_COMPARISON_IGNORED,
+ V(0, 0, 0, 0), "FEATURE_HARDWARE_VIDEO_DECODING_NO_LINUX_AMD", "");
+
+- // Disable on Release/late Beta
+-#if !defined(EARLY_BETA_OR_EARLIER)
+- APPEND_TO_DRIVER_BLOCKLIST(OperatingSystem::Linux, DeviceFamily::All,
+- nsIGfxInfo::FEATURE_HARDWARE_VIDEO_DECODING,
+- nsIGfxInfo::FEATURE_BLOCKED_DEVICE,
+- DRIVER_COMPARISON_IGNORED, V(0, 0, 0, 0),
+- "FEATURE_HARDWARE_VIDEO_DECODING_DISABLE",
"");
+-#endif
+-
+ ////////////////////////////////////
+ // FEATURE_WEBRENDER_PARTIAL_PRESENT
+ APPEND_TO_DRIVER_BLOCKLIST_EXT(
diff --git
a/http/firefox/patches/0034-bgo-860033-firefox-wayland-no-dbus.patch
b/http/firefox/patches/0034-bgo-860033-firefox-wayland-no-dbus.patch
new file mode 100644
index 0000000..7cf532a
--- /dev/null
+++ b/http/firefox/patches/0034-bgo-860033-firefox-wayland-no-dbus.patch
@@ -0,0 +1,49 @@
+diff --git a/toolkit/moz.configure b/toolkit/moz.configure
+--- a/toolkit/moz.configure
++++ b/toolkit/moz.configure
+@@ -2353,18 +2353,6 @@ with only_when(compile_environment & tar
+ )
+ set_config("MOZ_D3DCOMPILER_VISTA_DLL_PATH", d3d_compiler_dll.path)
+
+-# Remoting protocol support
+-# ==============================================================
+-
+-
+-@depends(toolkit)
+-def has_remote(toolkit):
+- if toolkit in ("gtk", "windows", "cocoa"):
+- return True
+-
+-
+-set_config("MOZ_HAS_REMOTE", has_remote)
+-set_define("MOZ_HAS_REMOTE", has_remote)
+
+ # RLBox Library Sandboxing wasm support
+ # ==============================================================
+@@ -2900,6 +2888,26 @@ with only_when(toolkit_gtk):
+ set_config("MOZ_ENABLE_DBUS", True)
+ set_define("MOZ_ENABLE_DBUS", True)
+
++# Remoting protocol support
++# ==============================================================
++
++@depends(
++ toolkit,
++ depends("--enable-dbus", when=toolkit_gtk)(lambda x: x),
++ depends(wayland_headers, when=toolkit_gtk)(lambda x: x),
++ depends(x11_headers, when=toolkit_gtk)(lambda x: x),
++)
++def has_remote(toolkit, dbus, wayland, x11):
++ if toolkit in ("windows", "cocoa"):
++ return True
++ if toolkit == "gtk":
++ if not dbus and wayland and not x11:
++ return
++ return True
++
++
++set_config("MOZ_HAS_REMOTE", has_remote)
++set_define("MOZ_HAS_REMOTE", has_remote)
+
+ # Necko's wifi scanner
+ # ==============================================================
diff --git
a/http/firefox/patches/0034-bmo-1769631-python-3.11-compatibility.patch
b/http/firefox/patches/0034-bmo-1769631-python-3.11-compatibility.patch
deleted file mode 100644
index 97ac3ce..0000000
--- a/http/firefox/patches/0034-bmo-1769631-python-3.11-compatibility.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-#
https://src.fedoraproject.org/rpms/firefox/c/4d45de9bff7b7ef01f7d3c9e53a61adc9cf3ce9e?branch=4d45de9bff7b7ef01f7d3c9e53a61adc9cf3ce9e
-
-diff -up firefox-102.0/xpcom/idl-parser/xpidl/xpidl.py.build-python-3.11
firefox-102.0/xpcom/idl-parser/xpidl/xpidl.py
---- firefox-102.0/xpcom/idl-parser/xpidl/xpidl.py.build-python-3.11
2022-06-23 09:10:31.000000000 +0200
-+++ firefox-102.0/xpcom/idl-parser/xpidl/xpidl.py 2022-07-15
16:18:52.048351493 +0200
-@@ -1572,13 +1572,13 @@ class IDLParser(object):
- t_ignore = " \t"
-
- def t_multilinecomment(self, t):
-- r"/\*(?s).*?\*/"
-+ r"/\*(?s:.)*?\*/"
- t.lexer.lineno += t.value.count("\n")
- if t.value.startswith("/**"):
- self._doccomments.append(t.value)
-
- def t_singlelinecomment(self, t):
-- r"(?m)//.*?$"
-+ r"(?m://.*?$)"
-
- def t_IID(self, t):
- return t
-@@ -1591,7 +1591,7 @@ class IDLParser(object):
- return t
-
- def t_LCDATA(self, t):
-- r"(?s)%\{[ ]*C\+\+[ ]*\n(?P<cdata>.*?\n?)%\}[ ]*(C\+\+)?"
-+ r"(?s:%\{[ ]*C\+\+[ ]*\n(?P<cdata>.*?\n?)%\}[ ]*(C\+\+)?)"
- t.type = "CDATA"
- t.value = t.lexer.lexmatch.group("cdata")
- t.lexer.lineno += t.value.count("\n")
diff --git
a/http/firefox/patches/0035-bmo-1773336-disable_audio_thread_priority_default_features.patch

b/http/firefox/patches/0035-bmo-1773336-disable_audio_thread_priority_default_features.patch
deleted file mode 100644
index 4f96eae..0000000
---
a/http/firefox/patches/0035-bmo-1773336-disable_audio_thread_priority_default_features.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 64d822a598f46f9d08a41eab6a7d416a6c54927b Mon Sep 17 00:00:00 2001
-From: Mike Hommey <mh AT glandium.org>
-Date: Wed, 8 Jun 2022 16:03:49 +0900
-Subject: [PATCH] Disable audio_thread_priority default features
-
-with_dbus is supposed to be optional in gecko, but in practice, the
-audio_thread_priority defaults force it on.
-# https://github.com/kinetiknz/audioipc/pull/5/
----
- audioipc/Cargo.toml | 1 +
- client/Cargo.toml | 1 +
- server/Cargo.toml | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/third_party/rust/audioipc/Cargo.toml
b/third_party/rust/audioipc/Cargo.toml
-index d69c56d..8a9dd3d 100644
---- a/third_party/rust/audioipc/Cargo.toml
-+++ b/third_party/rust/audioipc/Cargo.toml
-@@ -30,6 +30,7 @@ memmap2 = "0.2"
-
- [target.'cfg(target_os = "linux")'.dependencies.audio_thread_priority]
- version = "0.26.1"
-+default-features = false
-
- [target.'cfg(windows)'.dependencies]
- mio = "0.6.19"
-diff --git a/third_party/rust/audioipc-client/Cargo.toml
b/third_party/rust/audioipc-client/Cargo.toml
-index 3ffb268..5dbf5f6 100644
---- a/third_party/rust/audioipc-client/Cargo.toml
-+++ b/third_party/rust/audioipc-client/Cargo.toml
-@@ -19,3 +19,4 @@ tokio = { version="0.1", default-features=false, features
= ["rt-full"] }
-
- [dependencies.audio_thread_priority]
- version = "0.26.1"
-+default-features = false
-diff --git a/third_party/rust/audioipc-server/Cargo.toml
b/third_party/rust/audioipc-server/Cargo.toml
-index 2c82fbf..b2b710c 100644
---- a/third_party/rust/audioipc-server/Cargo.toml
-+++ b/third_party/rust/audioipc-server/Cargo.toml
-@@ -24,3 +24,4 @@ default-features = false
-
- [dependencies.audio_thread_priority]
- version = "0.26.1"
-+default-features = false
-
diff --git a/http/firefox/patches/0036-vaapi-fixes.patch
b/http/firefox/patches/0036-vaapi-fixes.patch
deleted file mode 100644
index 6fd0dce..0000000
--- a/http/firefox/patches/0036-vaapi-fixes.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up firefox-102.0/widget/gtk/DMABufLibWrapper.cpp.vaapi
firefox-102.0/widget/gtk/DMABufLibWrapper.cpp
---- firefox-102.0/widget/gtk/DMABufLibWrapper.cpp.vaapi 2022-07-01
09:49:50.215536872 +0200
-+++ firefox-102.0/widget/gtk/DMABufLibWrapper.cpp 2022-07-01
09:50:43.036306610 +0200
-@@ -283,10 +283,11 @@ bool nsDMABufDevice::IsDMABufTexturesEna
- bool nsDMABufDevice::IsDMABufVAAPIEnabled() {
- LOGDMABUF(
- ("nsDMABufDevice::IsDMABufVAAPIEnabled: EGL %d "
-- "media_ffmpeg_vaapi_enabled %d CanUseHardwareVideoDecoding %d "
-+ "CanUseHardwareVideoDecoding %d "
- "XRE_IsRDDProcess %d\n",
-- gfx::gfxVars::UseEGL(), StaticPrefs::media_ffmpeg_vaapi_enabled(),
-- gfx::gfxVars::CanUseHardwareVideoDecoding(), XRE_IsRDDProcess()));
-+ gfx::gfxVars::UseEGL(),
-+ gfx::gfxVars::CanUseHardwareVideoDecoding(),
-+ XRE_IsRDDProcess()));
- return gfx::gfxVars::UseVAAPI() && XRE_IsRDDProcess() &&
- gfx::gfxVars::CanUseHardwareVideoDecoding();
- }
diff --git
a/http/firefox/patches/0037-bgo-860033-firefox-wayland-no-remote.patch
b/http/firefox/patches/0037-bgo-860033-firefox-wayland-no-remote.patch
deleted file mode 100644
index 641c68b..0000000
--- a/http/firefox/patches/0037-bgo-860033-firefox-wayland-no-remote.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -ru firefox-102.0.1/toolkit/components/remote/moz.build
firefox-102.0.1-x/toolkit/components/remote/moz.build
---- firefox-102.0.1/toolkit/components/remote/moz.build 2022-07-05
14:21:22.000000000 +0200
-+++ firefox-102.0.1-x/toolkit/components/remote/moz.build 2022-07-31
15:35:33.318998511 +0200
-@@ -26,6 +26,13 @@
- "nsUnixRemoteServer.h",
- "RemoteUtils.h",
- ]
-+ elif CONFIG["MOZ_WAYLAND"]:
-+ # TODO: replace `pass` with source files for an eventual Wayland
implementation
-+ # SOURCES += [
-+ # "nsWLRemoteServer.cpp",
-+ # "nsWLRemoteClient.cpp",
-+ # ]
-+ pass
- else:
- SOURCES += [
- "nsGTKRemoteServer.cpp",
-diff -ru firefox-102.0.1/toolkit/components/remote/nsRemoteService.cpp
firefox-102.0.1-x/toolkit/components/remote/nsRemoteService.cpp
---- firefox-102.0.1/toolkit/components/remote/nsRemoteService.cpp
2022-07-05 14:33:20.000000000 +0200
-+++ firefox-102.0.1-x/toolkit/components/remote/nsRemoteService.cpp
2022-07-31 15:42:55.109996825 +0200
-@@ -10,6 +10,12 @@
- # ifdef MOZ_ENABLE_DBUS
- # include "nsDBusRemoteServer.h"
- # include "nsDBusRemoteClient.h"
-+# elif defined(MOZ_WAYLAND)
-+// TODO: replace generic client header include line
-+// by relevant inlcudes for a Wayland implementation
-+// # include "nsWLRemoteServer.h"
-+// # include "nsWLRemoteClient.h"
-+# include "nsRemoteClient.h"
- # else
- # include "nsGTKRemoteServer.h"
- # include "nsXRemoteClient.h"
-@@ -95,6 +101,10 @@
- #ifdef MOZ_WIDGET_GTK
- # if defined(MOZ_ENABLE_DBUS)
- client = MakeUnique<nsDBusRemoteClient>();
-+# elif defined(MOZ_WAYLAND)
-+ // TODO: replace return statement by Wayland client implementation
-+ // client = MakeUnique<nsWLRemoteClient>();
-+ return REMOTE_NOT_FOUND;
- # else
- client = MakeUnique<nsXRemoteClient>();
- # endif
-@@ -139,6 +149,10 @@
- #ifdef MOZ_WIDGET_GTK
- # if defined(MOZ_ENABLE_DBUS)
- mRemoteServer = MakeUnique<nsDBusRemoteServer>();
-+# elif defined(MOZ_WAYLAND)
-+ // TODO: replace return statement by Wayland server implementation
-+ // mRemoteServer = MakeUnique<nsWLRemoteServer>();
-+ return;
- # else
- mRemoteServer = MakeUnique<nsGTKRemoteServer>();
- # endif



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (c3ce2706fa87791cfb06a277decc483a51fcf2eb), Pavel Vinogradov, 08/23/2022

Archive powered by MHonArc 2.6.24.

Top of Page