Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (c0cd86499228b49cfd2dccb349c40fda314bdf79)

Chronological Thread  
    < 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 (c0cd86499228b49cfd2dccb349c40fda314bdf79)
  • Date: Mon, 29 Apr 2024 18:31:30 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

http/firefox/DETAILS
| 2
http/firefox/HISTORY
| 4
http/firefox/patches/0023-bmo-1559213-Support-system-av1.patch
| 96 +++++++++
http/firefox/patches/0024-bmo-1559213-Support-system-av1.patch
| 96 ---------
http/firefox/patches/0024-bmo-1874059-fix-libcxx-18.patch
| 16 +
http/firefox/patches/0025-bmo-1874059-fix-libcxx-18.patch
| 16 -
http/firefox/patches/0025-dont-use-build-id.patch
| 13 +

http/firefox/patches/0026-bgo-928137-add-epoll_pwait2-syscall-to-sandbox.patch
| 52 +++++
http/firefox/patches/0026-dont-use-build-id.patch
| 13 -

http/firefox/patches/0027-bgo-928137-add-epoll_pwait2-syscall-to-sandbox.patch
| 52 -----

http/firefox/patches/0027-bmo-1889054-fix-issues-with-non-unified-builds-missing-headers.patch
| 97 ++++++++++

http/firefox/patches/0028-bmo-1889054-fix-issues-with-non-unified-builds-missing-headers.patch
| 97 ----------

http/firefox/patches/0028-bmo-1890593-GetSystemWPADSetting-for-libproxy-enabled-builds.patch
| 37 +++

http/firefox/patches/0029-bmo-1890593-GetSystemWPADSetting-for-libproxy-enabled-builds.patch
| 37 ---
14 files changed, 316 insertions(+), 312 deletions(-)

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

http/firefox: version 125.0.3

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index aba64e1..bff2a01 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,5 +1,5 @@
SPELL=firefox
- VERSION=125.0.2
+ VERSION=125.0.3
SECURITY_PATCH=191
SOURCE="${SPELL}-${VERSION}.source.tar.xz"
# Watch: http://releases.mozilla.org/pub/firefox/releases/
/releases/([0-9.]+)/
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index b2d411e..cacdace 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2024-04-29 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 125.0.3
+ * patches/*: updated
+
2024-04-23 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 125.0.2

diff --git a/http/firefox/patches/0023-bmo-1559213-Support-system-av1.patch
b/http/firefox/patches/0023-bmo-1559213-Support-system-av1.patch
new file mode 100644
index 0000000..240ef56
--- /dev/null
+++ b/http/firefox/patches/0023-bmo-1559213-Support-system-av1.patch
@@ -0,0 +1,96 @@
+diff --git a/config/external/moz.build b/config/external/moz.build
+index 2fc8df57992e..63d18e50a961 100644
+--- a/config/external/moz.build
++++ b/config/external/moz.build
+@@ -40,8 +40,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
+ external_dirs += ["media/libvpx"]
+
+ if CONFIG["MOZ_AV1"]:
+- external_dirs += ["media/libaom"]
+- external_dirs += ["media/libdav1d"]
++ if not CONFIG["MOZ_SYSTEM_AV1"]:
++ external_dirs += ["media/libaom"]
++ external_dirs += ["media/libdav1d"]
+
+ if not CONFIG["MOZ_SYSTEM_PNG"]:
+ external_dirs += ["media/libpng"]
+diff --git a/dom/media/platforms/moz.build b/dom/media/platforms/moz.build
+index 5c6e25b3980b..ce99ebfb6d3f 100644
+--- a/dom/media/platforms/moz.build
++++ b/dom/media/platforms/moz.build
+@@ -81,6 +81,11 @@ if CONFIG["MOZ_AV1"]:
+ "agnostic/AOMDecoder.cpp",
+ "agnostic/DAV1DDecoder.cpp",
+ ]
++ if CONFIG['MOZ_SYSTEM_AV1']:
++ CXXFLAGS += CONFIG['MOZ_SYSTEM_LIBAOM_CFLAGS']
++ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBAOM_LIBS']
++ CXXFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS']
++ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS']
+
+ if CONFIG["MOZ_OMX"]:
+ EXPORTS += [
+diff --git a/media/ffvpx/libavcodec/moz.build
b/media/ffvpx/libavcodec/moz.build
+index 761fc8cf4cd9..793a5b8697a8 100644
+--- a/media/ffvpx/libavcodec/moz.build
++++ b/media/ffvpx/libavcodec/moz.build
+@@ -120,10 +120,16 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
+ 'vp9recon.c',
+ 'vpx_rac.c',
+ ]
+- USE_LIBS += [
+- 'dav1d',
+- 'media_libdav1d_asm',
+- ]
++ if CONFIG["MOZ_SYSTEM_AV1"]:
++ CFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS']
++ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS']
++ CFLAGS += CONFIG['MOZ_SYSTEM_LIBAOM_CFLAGS']
++ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBAOM_LIBS']
++ else:
++ USE_LIBS += [
++ 'dav1d',
++ 'media_libdav1d_asm',
++ ]
+ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
+ LOCAL_INCLUDES += ['/media/mozva']
+ SOURCES += [
+diff --git a/toolkit/moz.configure b/toolkit/moz.configure
+index f93a5d64fec8..814357f4e979 100644
+--- a/toolkit/moz.configure
++++ b/toolkit/moz.configure
+@@ -744,7 +744,23 @@ def av1(value):
+ return True
+
+
+-@depends(target, when=av1 & compile_environment)
++option("--with-system-av1",
++ help="Use system av1 (located with pkgconfig)")
++
++system_libaom_info = pkg_check_modules("MOZ_SYSTEM_LIBAOM", "aom >= 1.0.0",
++ when="--with-system-av1")
++
++system_libdav1d_info = pkg_check_modules("MOZ_SYSTEM_LIBDAV1D", "dav1d >=
0.1.1",
++ when="--with-system-av1")
++
++@depends(system_libaom_info, system_libdav1d_info)
++def system_av1(system_libaom_info, system_libdav1d_info):
++ has_av1_libs = False
++ if system_libaom_info and system_libdav1d_info:
++ has_av1_libs = True
++ return has_av1_libs
++
++@depends(target, when=av1 & depends(system_av1)(lambda v: not v) &
compile_environment)
+ def dav1d_asm(target):
+ if target.cpu in ("aarch64", "x86", "x86_64"):
+ return True
+@@ -760,6 +776,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)
++set_config("MOZ_SYSTEM_AV1", depends_if(system_av1)(lambda _: True))
+
+ # JXL Image Codec Support
+ # ==============================================================
+
+
diff --git a/http/firefox/patches/0024-bmo-1559213-Support-system-av1.patch
b/http/firefox/patches/0024-bmo-1559213-Support-system-av1.patch
deleted file mode 100644
index 240ef56..0000000
--- a/http/firefox/patches/0024-bmo-1559213-Support-system-av1.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff --git a/config/external/moz.build b/config/external/moz.build
-index 2fc8df57992e..63d18e50a961 100644
---- a/config/external/moz.build
-+++ b/config/external/moz.build
-@@ -40,8 +40,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
- external_dirs += ["media/libvpx"]
-
- if CONFIG["MOZ_AV1"]:
-- external_dirs += ["media/libaom"]
-- external_dirs += ["media/libdav1d"]
-+ if not CONFIG["MOZ_SYSTEM_AV1"]:
-+ external_dirs += ["media/libaom"]
-+ external_dirs += ["media/libdav1d"]
-
- if not CONFIG["MOZ_SYSTEM_PNG"]:
- external_dirs += ["media/libpng"]
-diff --git a/dom/media/platforms/moz.build b/dom/media/platforms/moz.build
-index 5c6e25b3980b..ce99ebfb6d3f 100644
---- a/dom/media/platforms/moz.build
-+++ b/dom/media/platforms/moz.build
-@@ -81,6 +81,11 @@ if CONFIG["MOZ_AV1"]:
- "agnostic/AOMDecoder.cpp",
- "agnostic/DAV1DDecoder.cpp",
- ]
-+ if CONFIG['MOZ_SYSTEM_AV1']:
-+ CXXFLAGS += CONFIG['MOZ_SYSTEM_LIBAOM_CFLAGS']
-+ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBAOM_LIBS']
-+ CXXFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS']
-+ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS']
-
- if CONFIG["MOZ_OMX"]:
- EXPORTS += [
-diff --git a/media/ffvpx/libavcodec/moz.build
b/media/ffvpx/libavcodec/moz.build
-index 761fc8cf4cd9..793a5b8697a8 100644
---- a/media/ffvpx/libavcodec/moz.build
-+++ b/media/ffvpx/libavcodec/moz.build
-@@ -120,10 +120,16 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
- 'vp9recon.c',
- 'vpx_rac.c',
- ]
-- USE_LIBS += [
-- 'dav1d',
-- 'media_libdav1d_asm',
-- ]
-+ if CONFIG["MOZ_SYSTEM_AV1"]:
-+ CFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS']
-+ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS']
-+ CFLAGS += CONFIG['MOZ_SYSTEM_LIBAOM_CFLAGS']
-+ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBAOM_LIBS']
-+ else:
-+ USE_LIBS += [
-+ 'dav1d',
-+ 'media_libdav1d_asm',
-+ ]
- if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
- LOCAL_INCLUDES += ['/media/mozva']
- SOURCES += [
-diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index f93a5d64fec8..814357f4e979 100644
---- a/toolkit/moz.configure
-+++ b/toolkit/moz.configure
-@@ -744,7 +744,23 @@ def av1(value):
- return True
-
-
--@depends(target, when=av1 & compile_environment)
-+option("--with-system-av1",
-+ help="Use system av1 (located with pkgconfig)")
-+
-+system_libaom_info = pkg_check_modules("MOZ_SYSTEM_LIBAOM", "aom >= 1.0.0",
-+ when="--with-system-av1")
-+
-+system_libdav1d_info = pkg_check_modules("MOZ_SYSTEM_LIBDAV1D", "dav1d >=
0.1.1",
-+ when="--with-system-av1")
-+
-+@depends(system_libaom_info, system_libdav1d_info)
-+def system_av1(system_libaom_info, system_libdav1d_info):
-+ has_av1_libs = False
-+ if system_libaom_info and system_libdav1d_info:
-+ has_av1_libs = True
-+ return has_av1_libs
-+
-+@depends(target, when=av1 & depends(system_av1)(lambda v: not v) &
compile_environment)
- def dav1d_asm(target):
- if target.cpu in ("aarch64", "x86", "x86_64"):
- return True
-@@ -760,6 +776,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)
-+set_config("MOZ_SYSTEM_AV1", depends_if(system_av1)(lambda _: True))
-
- # JXL Image Codec Support
- # ==============================================================
-
-
diff --git a/http/firefox/patches/0024-bmo-1874059-fix-libcxx-18.patch
b/http/firefox/patches/0024-bmo-1874059-fix-libcxx-18.patch
new file mode 100644
index 0000000..b21a93c
--- /dev/null
+++ b/http/firefox/patches/0024-bmo-1874059-fix-libcxx-18.patch
@@ -0,0 +1,16 @@
+--- a/build/moz.configure/toolchain.configure 2024-03-16 22:53:15.409390707
+0000
++++ b/build/moz.configure/toolchain.configure 2024-03-16 22:57:02.661805132
+0000
+@@ -2183,10 +2183,10 @@
+ set_define("_LIBCPP_HIDE_FROM_ABI",
libcxx_override_visibility.hide_from_abi)
+
+
+-@depends(target, build_environment)
+-def visibility_flags(target, env):
++@depends(target, build_environment, c_compiler)
++def visibility_flags(target, env, c_compiler):
+ if target.os != "WINNT":
+- if target.kernel == "Darwin":
++ if target.kernel == "Darwin" or (c_compiler.type == "clang" and
c_compiler.version >= "17.0.0"):
+ return ("-fvisibility=hidden", "-fvisibility-inlines-hidden")
+ return (
+ "-I%s/system_wrappers" % os.path.join(env.dist),
\ No newline at end of file
diff --git a/http/firefox/patches/0025-bmo-1874059-fix-libcxx-18.patch
b/http/firefox/patches/0025-bmo-1874059-fix-libcxx-18.patch
deleted file mode 100644
index b21a93c..0000000
--- a/http/firefox/patches/0025-bmo-1874059-fix-libcxx-18.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/build/moz.configure/toolchain.configure 2024-03-16 22:53:15.409390707
+0000
-+++ b/build/moz.configure/toolchain.configure 2024-03-16 22:57:02.661805132
+0000
-@@ -2183,10 +2183,10 @@
- set_define("_LIBCPP_HIDE_FROM_ABI",
libcxx_override_visibility.hide_from_abi)
-
-
--@depends(target, build_environment)
--def visibility_flags(target, env):
-+@depends(target, build_environment, c_compiler)
-+def visibility_flags(target, env, c_compiler):
- if target.os != "WINNT":
-- if target.kernel == "Darwin":
-+ if target.kernel == "Darwin" or (c_compiler.type == "clang" and
c_compiler.version >= "17.0.0"):
- return ("-fvisibility=hidden", "-fvisibility-inlines-hidden")
- return (
- "-I%s/system_wrappers" % os.path.join(env.dist),
\ No newline at end of file
diff --git a/http/firefox/patches/0025-dont-use-build-id.patch
b/http/firefox/patches/0025-dont-use-build-id.patch
new file mode 100644
index 0000000..0c72417
--- /dev/null
+++ b/http/firefox/patches/0025-dont-use-build-id.patch
@@ -0,0 +1,13 @@
+diff -Naur firefox-125.0.1/build/moz.configure/flags.configure
firefox-125.0.1-b/build/moz.configure/flags.configure
+--- firefox-125.0.1/build/moz.configure/flags.configure 2024-04-16
06:56:47.000000000 +0300
++++ firefox-125.0.1-b/build/moz.configure/flags.configure 2024-04-17
09:22:31.367849131 +0300
+@@ -157,9 +157,6 @@
+
+ check_and_add_flag("-pipe", when=building_with_gcc)
+
+-check_and_add_linker_flag("-Wl,--build-id=uuid", when=check_build_id_uuid)
+-check_and_add_linker_flag("-Wl,--build-id=sha1", when=check_build_id_sha1)
+-
+ check_and_add_asm_flag("-Wa,--noexecstack", when=building_with_gnu_cc)
+ check_and_add_linker_flag("-Wl,-z,noexecstack", when=building_with_gnu_cc)
+ check_and_add_linker_flag("-Wl,-z,text", when=building_with_gnu_cc)
diff --git
a/http/firefox/patches/0026-bgo-928137-add-epoll_pwait2-syscall-to-sandbox.patch

b/http/firefox/patches/0026-bgo-928137-add-epoll_pwait2-syscall-to-sandbox.patch
new file mode 100644
index 0000000..9fdfe88
--- /dev/null
+++
b/http/firefox/patches/0026-bgo-928137-add-epoll_pwait2-syscall-to-sandbox.patch
@@ -0,0 +1,52 @@
+diff --git
a/security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h

b/security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+index dc846ee..0f6b98d 100644
+---
a/security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
++++
b/security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+@@ -1279,6 +1279,10 @@
+ #define __NR_epoll_pwait 319
+ #endif
+
++#if !defined(__NR_epoll_pwait2)
++#define __NR_epoll_pwait 441
++#endif
++
+ #if !defined(__NR_utimensat)
+ #define __NR_utimensat 320
+ #endif
+diff --git
a/security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h

b/security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
+index ab51703..ff96dc4 100644
+---
a/security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
++++
b/security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
+@@ -1143,6 +1143,10 @@
+ #define __NR_epoll_pwait 281
+ #endif
+
++#if !defined(__NR_epoll_pwait2)
++#define __NR_epoll_pwait2 441
++#endif
++
+ #if !defined(__NR_signalfd)
+ #define __NR_signalfd 282
+ #endif
+diff --git a/security/sandbox/linux/SandboxFilterUtil.h
b/security/sandbox/linux/SandboxFilterUtil.h
+index 6e9180b..abdeb44 100644
+--- a/security/sandbox/linux/SandboxFilterUtil.h
++++ b/security/sandbox/linux/SandboxFilterUtil.h
+@@ -215,7 +215,16 @@ class SandboxPolicyBase : public
sandbox::bpf_dsl::Policy {
+ # define CASES_FOR_epoll_create case __NR_epoll_create1
+ #endif
+
+-#ifdef __NR_epoll_wait
++#if defined(__NR_epoll_pwait2) && defined(__NR_epoll_wait)
++# define CASES_FOR_epoll_wait \
++ case __NR_epoll_wait: \
++ case __NR_epoll_pwait: \
++ case __NR_epoll_pwait2
++#elif defined(__NR_epoll_pwait2)
++# define CASES_FOR_epoll_wait \
++ case __NR_epoll_pwait: \
++ case __NR_epoll_pwait2
++#elif defined(__NR_epoll_wait)
+ # define CASES_FOR_epoll_wait \
+ case __NR_epoll_wait: \
+ case __NR_epoll_pwait
diff --git a/http/firefox/patches/0026-dont-use-build-id.patch
b/http/firefox/patches/0026-dont-use-build-id.patch
deleted file mode 100644
index 0c72417..0000000
--- a/http/firefox/patches/0026-dont-use-build-id.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur firefox-125.0.1/build/moz.configure/flags.configure
firefox-125.0.1-b/build/moz.configure/flags.configure
---- firefox-125.0.1/build/moz.configure/flags.configure 2024-04-16
06:56:47.000000000 +0300
-+++ firefox-125.0.1-b/build/moz.configure/flags.configure 2024-04-17
09:22:31.367849131 +0300
-@@ -157,9 +157,6 @@
-
- check_and_add_flag("-pipe", when=building_with_gcc)
-
--check_and_add_linker_flag("-Wl,--build-id=uuid", when=check_build_id_uuid)
--check_and_add_linker_flag("-Wl,--build-id=sha1", when=check_build_id_sha1)
--
- check_and_add_asm_flag("-Wa,--noexecstack", when=building_with_gnu_cc)
- check_and_add_linker_flag("-Wl,-z,noexecstack", when=building_with_gnu_cc)
- check_and_add_linker_flag("-Wl,-z,text", when=building_with_gnu_cc)
diff --git
a/http/firefox/patches/0027-bgo-928137-add-epoll_pwait2-syscall-to-sandbox.patch

b/http/firefox/patches/0027-bgo-928137-add-epoll_pwait2-syscall-to-sandbox.patch
deleted file mode 100644
index 9fdfe88..0000000
---
a/http/firefox/patches/0027-bgo-928137-add-epoll_pwait2-syscall-to-sandbox.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git
a/security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h

b/security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
-index dc846ee..0f6b98d 100644
----
a/security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
-+++
b/security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
-@@ -1279,6 +1279,10 @@
- #define __NR_epoll_pwait 319
- #endif
-
-+#if !defined(__NR_epoll_pwait2)
-+#define __NR_epoll_pwait 441
-+#endif
-+
- #if !defined(__NR_utimensat)
- #define __NR_utimensat 320
- #endif
-diff --git
a/security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h

b/security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-index ab51703..ff96dc4 100644
----
a/security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-+++
b/security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-@@ -1143,6 +1143,10 @@
- #define __NR_epoll_pwait 281
- #endif
-
-+#if !defined(__NR_epoll_pwait2)
-+#define __NR_epoll_pwait2 441
-+#endif
-+
- #if !defined(__NR_signalfd)
- #define __NR_signalfd 282
- #endif
-diff --git a/security/sandbox/linux/SandboxFilterUtil.h
b/security/sandbox/linux/SandboxFilterUtil.h
-index 6e9180b..abdeb44 100644
---- a/security/sandbox/linux/SandboxFilterUtil.h
-+++ b/security/sandbox/linux/SandboxFilterUtil.h
-@@ -215,7 +215,16 @@ class SandboxPolicyBase : public
sandbox::bpf_dsl::Policy {
- # define CASES_FOR_epoll_create case __NR_epoll_create1
- #endif
-
--#ifdef __NR_epoll_wait
-+#if defined(__NR_epoll_pwait2) && defined(__NR_epoll_wait)
-+# define CASES_FOR_epoll_wait \
-+ case __NR_epoll_wait: \
-+ case __NR_epoll_pwait: \
-+ case __NR_epoll_pwait2
-+#elif defined(__NR_epoll_pwait2)
-+# define CASES_FOR_epoll_wait \
-+ case __NR_epoll_pwait: \
-+ case __NR_epoll_pwait2
-+#elif defined(__NR_epoll_wait)
- # define CASES_FOR_epoll_wait \
- case __NR_epoll_wait: \
- case __NR_epoll_pwait
diff --git
a/http/firefox/patches/0027-bmo-1889054-fix-issues-with-non-unified-builds-missing-headers.patch

b/http/firefox/patches/0027-bmo-1889054-fix-issues-with-non-unified-builds-missing-headers.patch
new file mode 100644
index 0000000..09ecf35
--- /dev/null
+++
b/http/firefox/patches/0027-bmo-1889054-fix-issues-with-non-unified-builds-missing-headers.patch
@@ -0,0 +1,97 @@
+
+# HG changeset patch
+# User Amit Prakash Ambasta <amit.prakash.ambasta AT gmail.com>
+# Date 1712664593 0
+# Node ID 2fc58e52651018d6739b7449a60c1a176218a39c
+# Parent 9f30ff6007c51338920625f326f3dd40e9cca652
+Bug 1889054 - Fix issues with non-unified builds missing header inclusions.
r=emilio
+
+Signed-off-by: Amit Prakash Ambasta <amit.prakash.ambasta AT gmail.com>
+
+Differential Revision: https://phabricator.services.mozilla.com/D207004
+
+diff --git a/accessible/html/HTMLSelectAccessible.cpp
b/accessible/html/HTMLSelectAccessible.cpp
+--- a/accessible/html/HTMLSelectAccessible.cpp
++++ b/accessible/html/HTMLSelectAccessible.cpp
+@@ -1,16 +1,17 @@
+ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2
-*- */
+ /* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+ #include "HTMLSelectAccessible.h"
+
+ #include "LocalAccessible-inl.h"
++#include "DocAccessible-inl.h"
+ #include "nsAccessibilityService.h"
+ #include "nsAccUtils.h"
+ #include "DocAccessible.h"
+ #include "mozilla/a11y/Role.h"
+ #include "States.h"
+
+ #include "nsCOMPtr.h"
+ #include "mozilla/dom/HTMLOptionElement.h"
+diff --git a/accessible/html/HTMLTableAccessible.cpp
b/accessible/html/HTMLTableAccessible.cpp
+--- a/accessible/html/HTMLTableAccessible.cpp
++++ b/accessible/html/HTMLTableAccessible.cpp
+@@ -7,16 +7,17 @@
+
+ #include <stdint.h>
+
+ #include "nsAccessibilityService.h"
+ #include "AccAttributes.h"
+ #include "ARIAMap.h"
+ #include "CacheConstants.h"
+ #include "LocalAccessible-inl.h"
++#include "DocAccessible-inl.h"
+ #include "nsTextEquivUtils.h"
+ #include "Relation.h"
+ #include "mozilla/a11y/Role.h"
+ #include "States.h"
+
+ #include "mozilla/a11y/TableAccessible.h"
+ #include "mozilla/a11y/TableCellAccessible.h"
+ #include "mozilla/Assertions.h"
+diff --git a/intl/components/src/TimeZone.h b/intl/components/src/TimeZone.h
+--- a/intl/components/src/TimeZone.h
++++ b/intl/components/src/TimeZone.h
+@@ -28,16 +28,17 @@
+
+ #include "mozilla/Assertions.h"
+ #include "mozilla/Casting.h"
+ #include "mozilla/intl/ICU4CGlue.h"
+ #include "mozilla/intl/ICUError.h"
+ #include "mozilla/Maybe.h"
+ #include "mozilla/Result.h"
+ #include "mozilla/Span.h"
++#include "mozilla/Try.h"
+ #include "mozilla/UniquePtr.h"
+
+ namespace mozilla::intl {
+
+ /**
+ * This component is a Mozilla-focused API for working with time zones in
+ * internationalization code. It is used in coordination with other
operations
+ * such as datetime formatting.
+diff --git a/widget/gtk/GtkCompositorWidget.cpp
b/widget/gtk/GtkCompositorWidget.cpp
+--- a/widget/gtk/GtkCompositorWidget.cpp
++++ b/widget/gtk/GtkCompositorWidget.cpp
+@@ -2,16 +2,17 @@
+ /* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+ #include "GtkCompositorWidget.h"
+
+ #include "mozilla/gfx/gfxVars.h"
+ #include "mozilla/layers/CompositorThread.h"
++#include "mozilla/WidgetUtilsGtk.h"
+ #include "mozilla/widget/InProcessCompositorWidget.h"
+ #include "mozilla/widget/PlatformWidgetTypes.h"
+ #include "nsWindow.h"
+
+ #ifdef MOZ_X11
+ # include "mozilla/X11Util.h"
+ #endif
+
+
diff --git
a/http/firefox/patches/0028-bmo-1889054-fix-issues-with-non-unified-builds-missing-headers.patch

b/http/firefox/patches/0028-bmo-1889054-fix-issues-with-non-unified-builds-missing-headers.patch
deleted file mode 100644
index 09ecf35..0000000
---
a/http/firefox/patches/0028-bmo-1889054-fix-issues-with-non-unified-builds-missing-headers.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-
-# HG changeset patch
-# User Amit Prakash Ambasta <amit.prakash.ambasta AT gmail.com>
-# Date 1712664593 0
-# Node ID 2fc58e52651018d6739b7449a60c1a176218a39c
-# Parent 9f30ff6007c51338920625f326f3dd40e9cca652
-Bug 1889054 - Fix issues with non-unified builds missing header inclusions.
r=emilio
-
-Signed-off-by: Amit Prakash Ambasta <amit.prakash.ambasta AT gmail.com>
-
-Differential Revision: https://phabricator.services.mozilla.com/D207004
-
-diff --git a/accessible/html/HTMLSelectAccessible.cpp
b/accessible/html/HTMLSelectAccessible.cpp
---- a/accessible/html/HTMLSelectAccessible.cpp
-+++ b/accessible/html/HTMLSelectAccessible.cpp
-@@ -1,16 +1,17 @@
- /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2
-*- */
- /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
- #include "HTMLSelectAccessible.h"
-
- #include "LocalAccessible-inl.h"
-+#include "DocAccessible-inl.h"
- #include "nsAccessibilityService.h"
- #include "nsAccUtils.h"
- #include "DocAccessible.h"
- #include "mozilla/a11y/Role.h"
- #include "States.h"
-
- #include "nsCOMPtr.h"
- #include "mozilla/dom/HTMLOptionElement.h"
-diff --git a/accessible/html/HTMLTableAccessible.cpp
b/accessible/html/HTMLTableAccessible.cpp
---- a/accessible/html/HTMLTableAccessible.cpp
-+++ b/accessible/html/HTMLTableAccessible.cpp
-@@ -7,16 +7,17 @@
-
- #include <stdint.h>
-
- #include "nsAccessibilityService.h"
- #include "AccAttributes.h"
- #include "ARIAMap.h"
- #include "CacheConstants.h"
- #include "LocalAccessible-inl.h"
-+#include "DocAccessible-inl.h"
- #include "nsTextEquivUtils.h"
- #include "Relation.h"
- #include "mozilla/a11y/Role.h"
- #include "States.h"
-
- #include "mozilla/a11y/TableAccessible.h"
- #include "mozilla/a11y/TableCellAccessible.h"
- #include "mozilla/Assertions.h"
-diff --git a/intl/components/src/TimeZone.h b/intl/components/src/TimeZone.h
---- a/intl/components/src/TimeZone.h
-+++ b/intl/components/src/TimeZone.h
-@@ -28,16 +28,17 @@
-
- #include "mozilla/Assertions.h"
- #include "mozilla/Casting.h"
- #include "mozilla/intl/ICU4CGlue.h"
- #include "mozilla/intl/ICUError.h"
- #include "mozilla/Maybe.h"
- #include "mozilla/Result.h"
- #include "mozilla/Span.h"
-+#include "mozilla/Try.h"
- #include "mozilla/UniquePtr.h"
-
- namespace mozilla::intl {
-
- /**
- * This component is a Mozilla-focused API for working with time zones in
- * internationalization code. It is used in coordination with other
operations
- * such as datetime formatting.
-diff --git a/widget/gtk/GtkCompositorWidget.cpp
b/widget/gtk/GtkCompositorWidget.cpp
---- a/widget/gtk/GtkCompositorWidget.cpp
-+++ b/widget/gtk/GtkCompositorWidget.cpp
-@@ -2,16 +2,17 @@
- /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
- #include "GtkCompositorWidget.h"
-
- #include "mozilla/gfx/gfxVars.h"
- #include "mozilla/layers/CompositorThread.h"
-+#include "mozilla/WidgetUtilsGtk.h"
- #include "mozilla/widget/InProcessCompositorWidget.h"
- #include "mozilla/widget/PlatformWidgetTypes.h"
- #include "nsWindow.h"
-
- #ifdef MOZ_X11
- # include "mozilla/X11Util.h"
- #endif
-
-
diff --git
a/http/firefox/patches/0028-bmo-1890593-GetSystemWPADSetting-for-libproxy-enabled-builds.patch

b/http/firefox/patches/0028-bmo-1890593-GetSystemWPADSetting-for-libproxy-enabled-builds.patch
new file mode 100644
index 0000000..e0c5a13
--- /dev/null
+++
b/http/firefox/patches/0028-bmo-1890593-GetSystemWPADSetting-for-libproxy-enabled-builds.patch
@@ -0,0 +1,37 @@
+
+# HG changeset patch
+# User Christoph Moench-Tegeder <cmt AT burggraben.net>
+# Date 1712783081 0
+# Node ID 15006906e885bda833a3f867cfd8ced955b3b5d5
+# Parent bc425d90bbe9987cc754323772553d4be3e6de83
+Bug 1890593 - GetSystemWPADSetting for libproxy-enabled builds r=jesup
+
+In #621429 a call to nsUnixSystemProxySettings::GetSystemWPADSetting()
+was added, but that function is not available for builds with
+MOZ_ENABLE_LIBPROXY. The funtion is trivial enough to just
+copy it across - else there'd more boilerplate than actual code.
+
+Differential Revision: https://phabricator.services.mozilla.com/D207197
+
+diff --git a/toolkit/system/unixproxy/nsLibProxySettings.cpp
b/toolkit/system/unixproxy/nsLibProxySettings.cpp
+--- a/toolkit/system/unixproxy/nsLibProxySettings.cpp
++++ b/toolkit/system/unixproxy/nsLibProxySettings.cpp
+@@ -94,11 +94,17 @@ nsresult nsUnixSystemProxySettings::GetP
+
+ c++;
+ }
+
+ free(proxyArray);
+ return NS_OK;
+ }
+
++NS_IMETHODIMP
++nsUnixSystemProxySettings::GetSystemWPADSetting(bool* aSystemWPADSetting) {
++ *aSystemWPADSetting = false;
++ return NS_OK;
++}
++
+ NS_IMPL_COMPONENT_FACTORY(nsUnixSystemProxySettings) {
+ return do_AddRef(new nsUnixSystemProxySettings()).downcast<nsISupports>();
+ }
+
diff --git
a/http/firefox/patches/0029-bmo-1890593-GetSystemWPADSetting-for-libproxy-enabled-builds.patch

b/http/firefox/patches/0029-bmo-1890593-GetSystemWPADSetting-for-libproxy-enabled-builds.patch
deleted file mode 100644
index e0c5a13..0000000
---
a/http/firefox/patches/0029-bmo-1890593-GetSystemWPADSetting-for-libproxy-enabled-builds.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-
-# HG changeset patch
-# User Christoph Moench-Tegeder <cmt AT burggraben.net>
-# Date 1712783081 0
-# Node ID 15006906e885bda833a3f867cfd8ced955b3b5d5
-# Parent bc425d90bbe9987cc754323772553d4be3e6de83
-Bug 1890593 - GetSystemWPADSetting for libproxy-enabled builds r=jesup
-
-In #621429 a call to nsUnixSystemProxySettings::GetSystemWPADSetting()
-was added, but that function is not available for builds with
-MOZ_ENABLE_LIBPROXY. The funtion is trivial enough to just
-copy it across - else there'd more boilerplate than actual code.
-
-Differential Revision: https://phabricator.services.mozilla.com/D207197
-
-diff --git a/toolkit/system/unixproxy/nsLibProxySettings.cpp
b/toolkit/system/unixproxy/nsLibProxySettings.cpp
---- a/toolkit/system/unixproxy/nsLibProxySettings.cpp
-+++ b/toolkit/system/unixproxy/nsLibProxySettings.cpp
-@@ -94,11 +94,17 @@ nsresult nsUnixSystemProxySettings::GetP
-
- c++;
- }
-
- free(proxyArray);
- return NS_OK;
- }
-
-+NS_IMETHODIMP
-+nsUnixSystemProxySettings::GetSystemWPADSetting(bool* aSystemWPADSetting) {
-+ *aSystemWPADSetting = false;
-+ return NS_OK;
-+}
-+
- NS_IMPL_COMPONENT_FACTORY(nsUnixSystemProxySettings) {
- return do_AddRef(new nsUnixSystemProxySettings()).downcast<nsISupports>();
- }
-

  • [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (c0cd86499228b49cfd2dccb349c40fda314bdf79), Pavel Vinogradov, 04/29/2024

Archive powered by MHonArc 2.6.24.

Top of Page