New commits:
commit 759a1e477cc728d9f82f33f79044959c5c7eb229
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
rust: ignore installed version, always
It is just too fragile to depend on an installed rust, which will fail
to build current rust if it skipped a version too many — especially
likely should we ever do stable grimoires again.
This change comments the bits where the installed rust would be used.
Maybe we come to a better conclusion later. Implement local stepping
over rust versions for bootstrap purposes … ship our own binaries …
commit 64e89b3f30dddbcfe3d3334c00e1aeb26cf02523
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
firefox-esr: sync up with firefox 115.0.1, ++SECURITY_PATCH
diff --git a/devel/rust/BUILD b/devel/rust/BUILD
index ae1cfc1..faf9313 100755
--- a/devel/rust/BUILD
+++ b/devel/rust/BUILD
@@ -15,16 +15,16 @@ export CFLAGS CXXFLAGS &&
# /usr/bin/rustc will be missing its soversion. You cannot win.
# Maybe we need our own bootstrap packages. Or a chain build starting
# with the latest available cache.
-if spell_ok "$SPELL"; then
- _rust_root="$INSTALL_ROOT/usr"
-else
+#if spell_ok "$SPELL"; then
+# _rust_root="$INSTALL_ROOT/usr"
+#else
_rust_root="$SOURCE_DIRECTORY/stage0-bootstrap" &&
install -D -m555 -t "$_rust_root"/bin "${SOURCE3%.tar.xz}"/cargo/bin/cargo
&&
for i in "$SOURCE4" "$SOURCE5"; do
./"${i%.tar.xz}"/install.sh \
--destdir="$_rust_root" --prefix=/ --disable-ldconfig || break
- done
-fi &&
+ done &&
+#fi &&
message "${MESSAGE_COLOR}OPTS=$OPTS${DEFAULT_COLOR}" &&
./configure \
--build="${BUILD/-pc-/-unknown-}" \
diff --git a/devel/rust/DETAILS b/devel/rust/DETAILS
index f95ca7b..b2c9b40 100755
--- a/devel/rust/DETAILS
+++ b/devel/rust/DETAILS
@@ -11,7 +11,10 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/rustc-$VERSION-src
SOURCE2_URL[0]="${SOURCE_URL[0]}.asc"
SOURCE_GPG=rust.gpg:$SOURCE.asc:UPSTREAM_KEY
SOURCE2_IGNORE=signature
-if ! spell_ok "${SPELL}"; then
+# Relying on installed old version is too fragile.
+# Need bootstrap package from upstream, unless we do our own
+# from a build farm.
+#if ! spell_ok "${SPELL}"; then
BUILDX="${BUILD/-pc-/-unknown-}"
SOURCE3="cargo-$VERSION-${BUILDX}.tar.xz"
SOURCE4="rust-std-$VERSION-${BUILDX}.tar.xz"
@@ -31,7 +34,7 @@ if ! spell_ok "${SPELL}"; then
SOURCE6_IGNORE=signature
SOURCE7_IGNORE=signature
SOURCE8_IGNORE=signature
-fi
+#fi
WEB_SITE=https://www.rust-lang.org/
ENTERED=20130529
LICENSE[0]=MIT
diff --git a/devel/rust/HISTORY b/devel/rust/HISTORY
index c562341..7cedc8f 100644
--- a/devel/rust/HISTORY
+++ b/devel/rust/HISTORY
@@ -4,6 +4,10 @@
* PRE_]BUILD: incorporated code from firefox spell to neutralize
checksumming
in all vendored crates
+2023-07-10 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS, PRE_BUILD, BUILD: Never use installed rust for
+ bootstrap, we do not catch errors due to outdated version.
+
2023-06-01 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.70.0
* BUILD: dropped --disable-llvm-version-check flag
diff --git a/devel/rust/PRE_BUILD b/devel/rust/PRE_BUILD
index 3615c48..29f1a1b 100755
--- a/devel/rust/PRE_BUILD
+++ b/devel/rust/PRE_BUILD
@@ -11,11 +11,11 @@ find vendor -name .cargo-checksum.json \
# Bootstrapping
# Installed rust will in general NOT WORK!
-if ! spell_ok "$SPELL"; then
+#if ! spell_ok "$SPELL"; then
unpack_file 3 &&
unpack_file 4 &&
- unpack_file 5
-fi &&
+ unpack_file 5 &&
+#fi &&
+if [[ $FIREFOX_SCCACHE == 'y' ]]; then
+ echo 'ac_add_options --with-ccache=sccache' >> .mozconfig
+fi &&
+
if [[ $FIREFOX_WIDEVINE == y ]]; then
echo "ac_add_options --enable-eme=widevine" >> .mozconfig
else
@@ -50,4 +52,10 @@ case "$HOST" in
ac_add_options --disable-gold
!
;;
-esac
+esac &&
+
+# clearing all checksums so the patches wouldn't cause troubles
+find third_party/rust -name .cargo-checksum.json \
+ -exec sed -i -e 's/\("files":{\)[^}]*/\1/' {} \; &&
+
+apply_patch_dir patches
diff --git
a/http/firefox-esr/patches/.0026-Disable-FFVPX-with-VA-API.patch.swp
b/http/firefox-esr/patches/.0026-Disable-FFVPX-with-VA-API.patch.swp
deleted file mode 100644
index 73b00ef..0000000
Binary files
a/http/firefox-esr/patches/.0026-Disable-FFVPX-with-VA-API.patch.swp and
/dev/null differ
diff --git a/http/firefox-esr/patches/0001-Don-t-use-build-id.patch
b/http/firefox-esr/patches/0001-Don-t-use-build-id.patch
index 27c2fc3..9976c89 100644
--- a/http/firefox-esr/patches/0001-Don-t-use-build-id.patch
+++ b/http/firefox-esr/patches/0001-Don-t-use-build-id.patch
@@ -1,29 +1,19 @@
-From db2794973f8a5e580fbceacbfb1b6469c9f162d7 Mon Sep 17 00:00:00 2001
-From: "Jory A. Pratt" <anarchy AT gentoo.org>
-Date: Mon, 6 Apr 2020 19:14:26 +0200
-Subject: [PATCH 01/30] Don't use build id
-
-We must drop build id as it causes conflicts when merging
-thunderbird/firefox/seamonkey on same system when using
-splitdebug.
-
-Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
----
- js/src/old-configure.in | 7 -------
- old-configure.in | 7 -------
- 2 files changed, 14 deletions(-)
-
-diff --git a/js/src/old-configure.in b/js/src/old-configure.in
-index 905494b784..15a7a2a852 100644
---- a/js/src/old-configure.in
-+++ b/js/src/old-configure.in
-@@ -350,13 +350,6 @@ if test "$GNU_CC"; then
+diff -Naur a/js/src/old-configure.in b/js/src/old-configure.in
+--- a/js/src/old-configure.in 2023-06-06 11:04:10.782830435 +0300
++++ b/js/src/old-configure.in 2023-06-06 11:05:30.197519064 +0300
+@@ -233,19 +233,6 @@
AC_MSG_RESULT([no])
LDFLAGS=$_SAVE_LDFLAGS)
-- AC_MSG_CHECKING([for --build-id=sha1 option to ld])
+- # While sha1 is deterministic, it is slower.
+- if test -z "$DEVELOPER_OPTIONS"; then
+- build_id=sha1
+- else
+- build_id=uuid
+- fi
+- AC_MSG_CHECKING([for --build-id=$build_id option to ld])
- _SAVE_LDFLAGS=$LDFLAGS
-- LDFLAGS="$LDFLAGS -Wl,--build-id=sha1"
+- LDFLAGS="$LDFLAGS -Wl,--build-id=$build_id"
- AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
- AC_MSG_RESULT([no])
- LDFLAGS=$_SAVE_LDFLAGS)
@@ -31,17 +21,22 @@ index 905494b784..15a7a2a852 100644
_DEFINES_CFLAGS="-include $jsconfdefs -DMOZILLA_CLIENT"
fi
b/http/firefox-esr/patches/0006-musl-Add-alternate-name-for-private-siginfo-struct-m.patch
new file mode 100644
index 0000000..300846f
--- /dev/null
+++
b/http/firefox-esr/patches/0006-musl-Add-alternate-name-for-private-siginfo-struct-m.patch
@@ -0,0 +1,35 @@
+From d8ec0bd6f3b0ad2dfd8a97a864f08decaafdea69 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel AT sholland.org>
+Date: Sun, 8 Jan 2017 19:16:38 -0600
+Subject: [PATCH 10/30] musl: Add alternate name for private siginfo struct
+ member
+
+musl does not provide a macro for detecting its presence. For now,
+assume that it is the only non-glibc-based libc on Linux systems.
+
+Signed-off-by: Samuel Holland <samuel AT sholland.org>
+Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
+---
+ security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc
b/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc
+index 9884be8bb2..86d8f88e30 100644
+--- a/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -174,7 +174,11 @@ void Trap::SigSys(int nr, LinuxSigInfo* info,
ucontext_t* ctx) {
+ // If the version of glibc doesn't include this information in
+ // siginfo_t (older than 2.17), we need to explicitly copy it
+ // into an arch_sigsys structure.
+- memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
++#if defined(__GLIBC__)
++ memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
++#else
++ memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
++#endif
+ #endif
+
+ #if defined(__mips__)
+--
+2.34.1
+
diff --git
a/http/firefox-esr/patches/0007-bmo-878089-Don-t-fail-when-TERM-is-not-set.patch
b/http/firefox-esr/patches/0007-bmo-878089-Don-t-fail-when-TERM-is-not-set.patch
deleted file mode 100644
index 6b1cde0..0000000
---
a/http/firefox-esr/patches/0007-bmo-878089-Don-t-fail-when-TERM-is-not-set.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From e43f7431036904989cfd520f19de28a72be97ad9 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi AT gentoo.org>
-Date: Mon, 6 Apr 2020 19:41:43 +0200
-Subject: [PATCH 08/30] bmo#878089: Don't fail when TERM is not set
-
-Link: https://github.com/erikrose/blessings/pull/137
-Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=878089
-Bug: https://bugs.gentoo.org/654316
-Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
----
- third_party/python/blessings/blessings/__init__.py | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/third_party/python/blessings/blessings/__init__.py
b/third_party/python/blessings/blessings/__init__.py
-index 388cece0b8..1283460cc9 100644
---- a/third_party/python/blessings/blessings/__init__.py
-+++ b/third_party/python/blessings/blessings/__init__.py
-@@ -94,8 +94,13 @@ class Terminal(object):
- # init sequences to the stream if it has a file descriptor, and
- # send them to stdout as a fallback, since they have to go
- # somewhere.
-- setupterm(kind or environ.get('TERM', 'unknown'),
-- self._init_descriptor)
-+ try:
-+ setupterm(kind or environ.get('TERM', 'dumb') or 'dumb',
-+ self._init_descriptor)
-+ except curses.error:
-+ # There was an error setting up the terminal, either curses
is
-+ # not supported or TERM is incorrectly set. Fall back to
dumb.
-+ self._does_styling = False
-
- self.stream = stream
-
---
-2.34.1
-
diff --git a/http/firefox-esr/patches/0007-musl-Fix-syscall-wrappers.patch
b/http/firefox-esr/patches/0007-musl-Fix-syscall-wrappers.patch
new file mode 100644
index 0000000..d9dda49
--- /dev/null
+++ b/http/firefox-esr/patches/0007-musl-Fix-syscall-wrappers.patch
@@ -0,0 +1,42 @@
+From 1b46c0fc085fe93c36320d7ac1004c83efccdccc Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel AT sholland.org>
+Date: Sun, 8 Jan 2017 19:19:23 -0600
+Subject: [PATCH 11/30] musl: Fix syscall wrappers
+
+musl defines p{read,write}64 to their non-suffixed equivalents to avoid
+duplication in its syscall wrappers. This breaks macro expansion here,
+leading to errors such as:
+
+In function size_t sys_pread64(int, void*, size_t, off_t):
+ error: '__NR_pread' was not declared in this scope
+
+The fix here is to undefine the p{read,write}64 macros, so the syscall
+expands to (e.g.) __NR_pread64 instead.
+
+Signed-off-by: Samuel Holland <samuel AT sholland.org>
+Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
+---
+ .../src/third_party/lss/linux_syscall_support.h | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git
a/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
b/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
+index 1abe0ba5b0..d6087a1674 100644
+---
a/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
++++
b/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
+@@ -173,6 +173,13 @@ extern "C" {
+ # undef __NR_waitpid
+ #endif
+
++#ifdef pread64
++#undef pread64
++#endif
++#ifdef pwrite64
++#undef pwrite64
++#endif
++
+ /* As glibc often provides subtly incompatible data structures (and implicit
+ * wrapper functions that convert them), we provide our own kernel data
+ * structures for use by the system calls.
+--
+2.34.1
+
diff --git
a/http/firefox-esr/patches/0008-bmo-1516803-Fix-building-sandbox.patch
b/http/firefox-esr/patches/0008-bmo-1516803-Fix-building-sandbox.patch
deleted file mode 100644
index 24333b2..0000000
--- a/http/firefox-esr/patches/0008-bmo-1516803-Fix-building-sandbox.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6eeeca1b673a60d3e51427b2a5cf3e916bdb012b Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi AT gentoo.org>
-Date: Mon, 6 Apr 2020 19:44:28 +0200
-Subject: [PATCH 09/30] bmo#1516803: Fix building sandbox
-
-Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1516803
-Bug: https://bugs.gentoo.org/666580
-Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
----
- security/sandbox/linux/moz.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/security/sandbox/linux/moz.build
b/security/sandbox/linux/moz.build
-index 573f667812..e62d1a99a4 100644
---- a/security/sandbox/linux/moz.build
-+++ b/security/sandbox/linux/moz.build
-@@ -116,7 +116,7 @@ if CONFIG["CC_TYPE"] in ("clang", "gcc"):
- # forcing there to be only one partition.
- for f in CONFIG["OS_CXXFLAGS"]:
- if f.startswith("-flto") and CONFIG["CC_TYPE"] != "clang":
-- LDFLAGS += ["--param lto-partitions=1"]
-+ LDFLAGS += ["--param", "lto-partitions=1"]
-
- DEFINES["NS_NO_XPCOM"] = True
- DisableStlWrapping()
---
-2.34.1
-
diff --git
a/http/firefox-esr/patches/0008-musl-Only-use-system-heap-reporter-with-glibc.patch
b/http/firefox-esr/patches/0008-musl-Only-use-system-heap-reporter-with-glibc.patch
new file mode 100644
index 0000000..08f0214
--- /dev/null
+++
b/http/firefox-esr/patches/0008-musl-Only-use-system-heap-reporter-with-glibc.patch
@@ -0,0 +1,33 @@
+From 68dd87a3dc06cf59396dccc3e031761f7237656e Mon Sep 17 00:00:00 2001
+From: "Jory A. Pratt" <anarchy AT gentoo.org>
+Date: Mon, 6 Apr 2020 20:09:26 +0200
+Subject: [PATCH 12/30] musl: Only use system heap reporter with glibc
+
+Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
+---
+ xpcom/base/nsMemoryReporterManager.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/xpcom/base/nsMemoryReporterManager.cpp
b/xpcom/base/nsMemoryReporterManager.cpp
+index bd4629c785..b513f81216 100644
+--- a/xpcom/base/nsMemoryReporterManager.cpp
++++ b/xpcom/base/nsMemoryReporterManager.cpp
+@@ -647,6 +647,7 @@ static bool InSharedRegion(mach_vm_address_t aAddr,
cpu_type_t aType) {
+ return NS_OK;
+ }
+
++#ifdef __GLIBC__
+ # define HAVE_SYSTEM_HEAP_REPORTER 1
+ // Windows can have multiple separate heaps, but we should not touch
non-default
+ // heaps because they may be destroyed at anytime while we hold a handle.
So we
+@@ -679,6 +680,7 @@ static bool InSharedRegion(mach_vm_address_t aAddr,
cpu_type_t aType) {
+ *aSizeOut = heapSize;
+ return NS_OK;
+ }
++#endif
+
+ struct SegmentKind {
+ DWORD mState;
+--
+2.34.1
+
diff --git
a/http/firefox-esr/patches/0009-musl-Add-alternate-name-for-private-siginfo-struct-m.patch
b/http/firefox-esr/patches/0009-musl-Add-alternate-name-for-private-siginfo-struct-m.patch
deleted file mode 100644
index 300846f..0000000
---
a/http/firefox-esr/patches/0009-musl-Add-alternate-name-for-private-siginfo-struct-m.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From d8ec0bd6f3b0ad2dfd8a97a864f08decaafdea69 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel AT sholland.org>
-Date: Sun, 8 Jan 2017 19:16:38 -0600
-Subject: [PATCH 10/30] musl: Add alternate name for private siginfo struct
- member
-
-musl does not provide a macro for detecting its presence. For now,
-assume that it is the only non-glibc-based libc on Linux systems.
-
-Signed-off-by: Samuel Holland <samuel AT sholland.org>
-Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
----
- security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc
b/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc
-index 9884be8bb2..86d8f88e30 100644
---- a/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc
-+++ b/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc
-@@ -174,7 +174,11 @@ void Trap::SigSys(int nr, LinuxSigInfo* info,
ucontext_t* ctx) {
- // If the version of glibc doesn't include this information in
- // siginfo_t (older than 2.17), we need to explicitly copy it
- // into an arch_sigsys structure.
-- memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
-+#if defined(__GLIBC__)
-+ memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
-+#else
-+ memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
-+#endif
- #endif
-
- #if defined(__mips__)
---
-2.34.1
-
diff --git
a/http/firefox-esr/patches/0009-musl-Set-pthread-name-for-non-glibc-systems.patch
b/http/firefox-esr/patches/0009-musl-Set-pthread-name-for-non-glibc-systems.patch
new file mode 100644
index 0000000..fe74bb1
--- /dev/null
+++
b/http/firefox-esr/patches/0009-musl-Set-pthread-name-for-non-glibc-systems.patch
@@ -0,0 +1,29 @@
+From 70d47d18420fe9e3de8f896c08f97ef2596c9c84 Mon Sep 17 00:00:00 2001
+From: "Jory A. Pratt" <anarchy AT gentoo.org>
+Date: Mon, 6 Apr 2020 20:10:03 +0200
+Subject: [PATCH 13/30] musl: Set pthread name for non glibc systems
+
+Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
+---
+ js/src/threading/posix/PosixThread.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/js/src/threading/posix/PosixThread.cpp
b/js/src/threading/posix/PosixThread.cpp
+index 35532e375b..983da45326 100644
+--- a/js/src/threading/posix/PosixThread.cpp
++++ b/js/src/threading/posix/PosixThread.cpp
+@@ -115,8 +115,10 @@ void ThisThread::SetName(const char* name) {
+ rv = 0;
+ #elif defined(__NetBSD__)
+ rv = pthread_setname_np(pthread_self(), "%s", (void*)name);
+-#else
++#elif defined(__GLIBC__)
+ rv = pthread_setname_np(pthread_self(), name);
++#else
++ rv = 0;
+ #endif
+ MOZ_RELEASE_ASSERT(!rv);
+ }
+--
+2.34.1
+
diff --git a/http/firefox-esr/patches/0010-musl-Fix-syscall-wrappers.patch
b/http/firefox-esr/patches/0010-musl-Fix-syscall-wrappers.patch
deleted file mode 100644
index d9dda49..0000000
--- a/http/firefox-esr/patches/0010-musl-Fix-syscall-wrappers.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 1b46c0fc085fe93c36320d7ac1004c83efccdccc Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel AT sholland.org>
-Date: Sun, 8 Jan 2017 19:19:23 -0600
-Subject: [PATCH 11/30] musl: Fix syscall wrappers
-
-musl defines p{read,write}64 to their non-suffixed equivalents to avoid
-duplication in its syscall wrappers. This breaks macro expansion here,
-leading to errors such as:
-
-In function size_t sys_pread64(int, void*, size_t, off_t):
- error: '__NR_pread' was not declared in this scope
-
-The fix here is to undefine the p{read,write}64 macros, so the syscall
-expands to (e.g.) __NR_pread64 instead.
-
-Signed-off-by: Samuel Holland <samuel AT sholland.org>
-Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
----
- .../src/third_party/lss/linux_syscall_support.h | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git
a/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
b/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
-index 1abe0ba5b0..d6087a1674 100644
----
a/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
-+++
b/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
-@@ -173,6 +173,13 @@ extern "C" {
- # undef __NR_waitpid
- #endif
-
-+#ifdef pread64
-+#undef pread64
-+#endif
-+#ifdef pwrite64
-+#undef pwrite64
-+#endif
-+
- /* As glibc often provides subtly incompatible data structures (and implicit
- * wrapper functions that convert them), we provide our own kernel data
- * structures for use by the system calls.
---
-2.34.1
-
diff --git
a/http/firefox-esr/patches/0010-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch
b/http/firefox-esr/patches/0042-p02-bmo-1772721-build-wayland-only-D148496fixed.patch
deleted file mode 100644
index 22a9cb0..0000000
---
a/http/firefox-esr/patches/0042-p02-bmo-1772721-build-wayland-only-D148496fixed.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/widget/gtk/mozgtk/moz.build b/widget/gtk/mozgtk/moz.build
---- a/widget/gtk/mozgtk/moz.build
-+++ b/widget/gtk/mozgtk/moz.build
-@@ -9,10 +9,11 @@
- SOURCES += [
- "mozgtk.c",
- ]
-
- CFLAGS += CONFIG["MOZ_X11_CFLAGS"]
-+CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
-
- # If LDFLAGS contains -Wl,--as-needed or if it's the default for the
toolchain,
- # we need to add -Wl,--no-as-needed before the gtk libraries, otherwise the
- # linker will drop those dependencies because no symbols are used from them.
- # But those dependencies need to be kept for things to work properly.
-diff --git a/widget/gtk/mozgtk/mozgtk.c b/widget/gtk/mozgtk/mozgtk.c
---- a/widget/gtk/mozgtk/mozgtk.c
-+++ b/widget/gtk/mozgtk/mozgtk.c
-@@ -4,10 +4,17 @@
- * 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 "mozilla/Types.h"
-
-+#include <gdk/gdk.h>
-+
-+// Dummy call to gtk3 library to prevent the linker from removing
-+// the gtk3 dependency with --as-needed.
-+// see toolkit/library/moz.build for details.
-+MOZ_EXPORT void mozgtk_linker_holder() { gdk_display_get_default(); }
-+
- #ifdef MOZ_X11
- # include <X11/Xlib.h>
- // Bug 1271100
- // We need to trick system Cairo into not using the XShm extension due to
- // a race condition in it that results in frequent BadAccess errors. Cairo
-diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
---- a/widget/gtk/nsWindow.cpp
-+++ b/widget/gtk/nsWindow.cpp
-@@ -266,10 +266,13 @@
- return sTimeConverterSingleton;
- }
-
- bool nsWindow::sTransparentMainWindow = false;
-
-+// forward declare from mozgtk
-+extern "C" MOZ_EXPORT void mozgtk_linker_holder();
-+
- namespace mozilla {
-
- #ifdef MOZ_X11
- class CurrentX11TimeGetter {
- public:
-@@ -426,10 +429,14 @@
- do_GetService("@mozilla.org/widget/clipboard;1");
- NS_ASSERTION(clipboard, "Failed to init clipboard!");
- }
- #endif
- }
-+ // Dummy call to mozgtk to prevent the linker from removing
-+ // the dependency with --as-needed.
-+ // see toolkit/library/moz.build for details.
-+ mozgtk_linker_holder();
- }
-
- nsWindow::~nsWindow() {
- LOG("nsWindow::~nsWindow()");
-
-@@ -5332,14 +5339,10 @@
- //
- // If the window were to get unredirected, there could be visible
- // tearing because Gecko does not align its framebuffer updates with
- // vblank.
- SetCompositorHint(GTK_WIDGET_COMPOSIDED_ENABLED);
--
-- // Dummy call to a function in mozgtk to prevent the linker from
removing
-- // the dependency with --as-needed.
-- XShmQueryExtension(DefaultXDisplay());
- }
- #endif
- #ifdef MOZ_WAYLAND
- if (GdkIsWaylandDisplay()) {
- mSurfaceProvider.Initialize(this);
-
diff --git
a/http/firefox-esr/patches/0043-p02-bmo-1772721-build-wayland-only.patch
b/http/firefox-esr/patches/0043-p02-bmo-1772721-build-wayland-only.patch
deleted file mode 100644
index 63907fd..0000000
--- a/http/firefox-esr/patches/0043-p02-bmo-1772721-build-wayland-only.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur a/widget/gtk/mozgtk/mozgtk.c b/widget/gtk/mozgtk/mozgtk.c
---- a/widget/gtk/mozgtk/mozgtk.c 2022-06-18 19:17:31.464160229 -0000
-+++ b/widget/gtk/mozgtk/mozgtk.c 2022-06-18 19:24:34.966749520 -0000
-@@ -8,6 +8,8 @@
-
- #include <gdk/gdk.h>
-
-+MOZ_EXPORT unsigned int gtk_get_debug_flags(void) { return 0; }
-+
- // Dummy call to gtk3 library to prevent the linker from removing
- // the gtk3 dependency with --as-needed.
- // see toolkit/library/moz.build for details.
-diff -Naur a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
---- a/widget/gtk/nsWindow.cpp 2022-06-18 19:17:31.464160229 -0000
-+++ b/widget/gtk/nsWindow.cpp 2022-06-18 19:26:47.689851900 -0000
-@@ -5312,6 +5312,9 @@
- SetCompositorHint(GTK_WIDGET_COMPOSIDED_ENABLED);
- }
- #endif
-+// Dummy call to a function in mozgtk to prevent the linker from removing
-+// the dependency with --as-needed.
-+gtk_get_debug_flags();
- #ifdef MOZ_WAYLAND
- if (GdkIsWaylandDisplay()) {
- mSurfaceProvider.Initialize(this);
diff --git
a/http/firefox-esr/patches/0044-p03-bmo-1772513-build-wayland-only-D148256.patch