Skip to Content.
Sympa Menu

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

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 (584fab864f8790ecd77aaf6559d7ac88689df473)
  • Date: Tue, 20 Feb 2024 17:26:25 +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/0005-bmo-1559213-Support-system-av1.patch |
28
http/firefox/patches/0027-bgo-919418-ppc64-flac-decoder-unsupported.patch |
11
http/firefox/patches/0027-bmo-1743144-add-wayland-proxy-cache.patch |
1029 ----------
http/firefox/patches/0028-bgo-919418-ppc64-flac-decoder-unsupported.patch |
11
http/firefox/patches/0029-bmo-1793001-switch-egrep-to-grepE.patch |
171 -
8 files changed, 28 insertions(+), 1233 deletions(-)

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

http/firefox: version 123.0, SECURITY_PATCH++

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 71926f9..b0cb0e2 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -52,7 +52,7 @@ depends libwebp "--with-system-webp"
&&

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

-local NSS_BRANCH="3.95" &&
+local NSS_BRANCH="3.97" &&
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 1cb813a..0eb8ede 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
SPELL=firefox
- VERSION=122.0.1
- SECURITY_PATCH=187
+ VERSION=123.0
+ SECURITY_PATCH=188
SOURCE="${SPELL}-${VERSION}.source.tar.xz"
# Watch: http://releases.mozilla.org/pub/firefox/releases/
/releases/([0-9.]+)/

SOURCE_URL[0]="http://releases.mozilla.org/pub/${SPELL}/releases/${VERSION}/source/${SOURCE}";
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 164fbdb..2d85408 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2024-02-20 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 123.0, SECURITY_PATCH++
+ * DEPENDS: nss >= 3.97
+ * patches/*: updated
+
2024-02-06 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 122.0.1

diff --git a/http/firefox/patches/0005-bmo-1559213-Support-system-av1.patch
b/http/firefox/patches/0005-bmo-1559213-Support-system-av1.patch
index 7b7a3f2..6664a80 100644
--- a/http/firefox/patches/0005-bmo-1559213-Support-system-av1.patch
+++ b/http/firefox/patches/0005-bmo-1559213-Support-system-av1.patch
@@ -13,24 +13,6 @@ diff -up
firefox-122.0/config/external/moz.build.system-av1 firefox-122.0/config

if not CONFIG["MOZ_SYSTEM_PNG"]:
external_dirs += ["media/libpng"]
-diff -up firefox-122.0/config/system-headers.mozbuild.system-av1
firefox-122.0/config/system-headers.mozbuild
---- firefox-122.0/config/system-headers.mozbuild.system-av1 2024-01-19
18:27:03.513034826 +0100
-+++ firefox-122.0/config/system-headers.mozbuild 2024-01-19
19:02:54.515493457 +0100
-@@ -1304,6 +1304,14 @@ if CONFIG["MOZ_ENABLE_LIBPROXY"]:
- "proxy.h",
- ]
-
-+if CONFIG['MOZ_SYSTEM_AV1']:
-+ system_headers += [
-+ 'aom/aom_decoder.h',
-+ 'aom/aomdx.h',
-+ 'aom/aom_image.h',
-+ 'dav1d/dav1d.h',
-+ ]
-+
- if CONFIG["MOZ_SYSTEM_ICU"]:
- system_headers += [
- "unicode/calendar.h",
diff -up firefox-122.0/dom/media/platforms/moz.build.system-av1
firefox-122.0/dom/media/platforms/moz.build
--- firefox-122.0/dom/media/platforms/moz.build.system-av1 2024-01-18
21:41:21.000000000 +0100
+++ firefox-122.0/dom/media/platforms/moz.build 2024-01-19
18:27:03.513034826 +0100
@@ -89,4 +71,12 @@ diff -up firefox-122.0/toolkit/moz.configure.system-av1
firefox-122.0/toolkit/mo

# JXL Image Codec Support
# ==============================================================
-
+diff -up a/config/external/gkcodecs/moz.build
b/config/external/gkcodecs/moz.build
+--- a/config/external/gkcodecs/moz.build 2024-02-14 07:18:40 UTC
++++ b/config/external/gkcodecs/moz.build
+@@ -16,3 +16,5 @@ if CONFIG["MOZ_SYSTEM_LIBVPX"]:
+ SYMBOLS_FILE = "gkcodecs.symbols"
+ if CONFIG["MOZ_SYSTEM_LIBVPX"]:
+ DEFINES["MOZ_SYSTEM_LIBVPX"] = True
++if CONFIG["OS_TARGET"] == "Linux":
++ OS_LIBS += [ "m" ]
diff --git
a/http/firefox/patches/0027-bgo-919418-ppc64-flac-decoder-unsupported.patch
b/http/firefox/patches/0027-bgo-919418-ppc64-flac-decoder-unsupported.patch
new file mode 100644
index 0000000..660b1ff
--- /dev/null
+++
b/http/firefox/patches/0027-bgo-919418-ppc64-flac-decoder-unsupported.patch
@@ -0,0 +1,11 @@
+--- a/dom/media/flac/FlacDecoder.cpp 2023-11-23 07:59:17.466486168 -0500
++++ b/dom/media/flac/FlacDecoder.cpp 2023-11-23 08:00:49.048026379 -0500
+@@ -18,7 +18,7 @@
+ #elif defined(MOZ_FFMPEG)
+ RefPtr<PDMFactory> platform = new PDMFactory();
+ return StaticPrefs::media_flac_enabled() &&
+- (platform->SupportsMimeType("audio/flac"_ns) !=
media::DecodeSupport::Unsupported);
++ !(platform->SupportsMimeType("audio/flac"_ns).isEmpty());
+ #else
+ return false;
+ #endif
diff --git
a/http/firefox/patches/0027-bmo-1743144-add-wayland-proxy-cache.patch
b/http/firefox/patches/0027-bmo-1743144-add-wayland-proxy-cache.patch
deleted file mode 100644
index 2d62b8a..0000000
--- a/http/firefox/patches/0027-bmo-1743144-add-wayland-proxy-cache.patch
+++ /dev/null
@@ -1,1029 +0,0 @@
-
-# HG changeset patch
-# User stransky <stransky AT redhat.com>
-# Date 1704803101 0
-# Node ID 6a0659188d6c3d77231a59f836c1a42462d2725c
-# Parent 051ee8b6b5420d6e2ef877ed6ff3a70306257659
-Bug 1743144 [Wayland] Implement Wayland proxy r=emilio
-
-Differential Revision: https://phabricator.services.mozilla.com/D196554
-
-diff --git a/third_party/wayland-proxy/moz.build
b/third_party/wayland-proxy/moz.build
-new file mode 100644
---- /dev/null
-+++ b/third_party/wayland-proxy/moz.build
-@@ -0,0 +1,16 @@
-+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-+# vim: set filetype=python:
-+# 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/.
-+
-+with Files("**"):
-+ BUG_COMPONENT = ("Core", "Widget: Gtk")
-+
-+SOURCES += [
-+ "wayland-proxy.cpp",
-+]
-+EXPORTS += [
-+ "wayland-proxy.h",
-+]
-+FINAL_LIBRARY = "xul"
-diff --git a/third_party/wayland-proxy/wayland-proxy.cpp
b/third_party/wayland-proxy/wayland-proxy.cpp
-new file mode 100644
---- /dev/null
-+++ b/third_party/wayland-proxy/wayland-proxy.cpp
-@@ -0,0 +1,755 @@
-+/* -*- Mode: C++; tab-width: 2; 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/. */
-+
-+// This code is based on Rust implementation at
-+// https://github.com/the8472/weyland-p5000
-+
-+// Version 1.1
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <sys/ioctl.h>
-+#include <sys/socket.h>
-+#include <sys/stat.h>
-+#include <sys/wait.h>
-+#include <sys/un.h>
-+#include <spawn.h>
-+#include <poll.h>
-+#include <vector>
-+#include <cerrno>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <memory>
-+#include <cassert>
-+#include <pthread.h>
-+#include <sched.h>
-+
-+#include "wayland-proxy.h"
-+
-+// The maximum number of fds libwayland can recvmsg at once
-+#define MAX_LIBWAY_FDS 28
-+#define MAX_DATA_SIZE 4096
-+#define POLL_TIMEOUT 30000
-+
-+// sockaddr_un has hardcoded max len of sun_path
-+#define MAX_WAYLAND_DISPLAY_NAME_LEN 108
-+
-+// Name of Wayland display provided by compositor
-+char sWaylandDisplay[MAX_WAYLAND_DISPLAY_NAME_LEN];
-+
-+// Name of Wayland display provided by us
-+char sWaylandProxy[MAX_WAYLAND_DISPLAY_NAME_LEN];
-+
-+bool sPrintInfo = false;
-+
-+void Info(const char* aFormat, ...) {
-+ if (!sPrintInfo) {
-+ return;
-+ }
-+ va_list args;
-+ va_start(args, aFormat);
-+ vfprintf(stderr, aFormat, args);
-+ va_end(args);
-+}
-+
-+void Warning(const char* aOperation, bool aPrintErrno = true) {
-+ fprintf(stderr, "Wayland Proxy warning: %s : %s\n", aOperation,
-+ aPrintErrno ? strerror(errno) : "");
-+}
-+
-+void Error(const char* aOperation, bool aPrintErrno = true) {
-+ fprintf(stderr, "Wayland Proxy error: %s : %s\n", aOperation,
-+ aPrintErrno ? strerror(errno) : "");
-+}
-+
-+void ErrorPlain(const char* aFormat, ...) {
-+ va_list args;
-+ va_start(args, aFormat);
-+ vfprintf(stderr, aFormat, args);
-+ va_end(args);
-+}
-+
-+class WaylandMessage {
-+ public:
-+ bool Write(int aSocket);
-+
-+ bool Loaded() const { return mLoaded && (mFds.size() || mData.size()); }
-+ bool Failed() const { return mFailed; }
-+
-+ explicit WaylandMessage(int aSocket) { Read(aSocket); }
-+ ~WaylandMessage();
-+
-+ private:
-+ bool Read(int aSocket);
-+
-+ private:
-+ bool mLoaded = false;
-+ bool mFailed = false;
-+
-+ std::vector<int> mFds;
-+ std::vector<unsigned char> mData;
-+};
-+
-+class ProxiedConnection {
-+ public:
-+ bool Init(int aChildSocket);
-+ bool IsConnected() { return mCompositorConnected; }
-+
-+ struct pollfd* AddToPollFd(struct pollfd* aPfds);
-+ struct pollfd* LoadPollFd(struct pollfd* aPfds);
-+
-+ // Process this connection (send/receive data).
-+ // Returns false if connection is broken and should be removed.
-+ bool Process();
-+
-+ ~ProxiedConnection();
-+
-+ private:
-+ // Try to connect to compositor. Returns false in case of fatal error.
-+ bool ConnectToCompositor();
-+
-+ bool TransferOrQueue(
-+ int aSourceSocket, int aSourcePollFlags, int aDestSocket,
-+ std::vector<std::unique_ptr<WaylandMessage>>* aMessageQueue);
-+ bool FlushQueue(int aDestSocket, int aDestPollFlags,
-+ std::vector<std::unique_ptr<WaylandMessage>>&
aMessageQueue);
-+
-+ // We don't have connected compositor yet. Try to connect
-+ bool mCompositorConnected = false;
-+
-+ // We're disconnected from app or compositor. We will close this
connection.
-+ bool mFailed = false;
-+
-+ int mCompositorSocket = -1;
-+ int mCompositorFlags = 0;
-+
-+ int mApplicationSocket = -1;
-+ int mApplicationFlags = 0;
-+
-+ // Stored proxied data
-+ std::vector<std::unique_ptr<WaylandMessage>> mToCompositorQueue;
-+ std::vector<std::unique_ptr<WaylandMessage>> mToApplicationQueue;
-+};
-+
-+WaylandMessage::~WaylandMessage() {
-+ for (auto const fd : mFds) {
-+ close(fd);
-+ }
-+}
-+
-+bool WaylandMessage::Read(int aSocket) {
-+ // We don't expect WaylandMessage re-read
-+ assert(!mLoaded && !mFailed);
-+
-+ mData.resize(MAX_DATA_SIZE);
-+
-+ struct msghdr msg = {0};
-+ struct iovec iov = {mData.data(), mData.size()};
-+ msg.msg_iov = &iov;
-+ msg.msg_iovlen = 1;
-+
-+ char cmsgdata[(CMSG_LEN(MAX_LIBWAY_FDS * sizeof(int32_t)))] = {0};
-+ msg.msg_control = &cmsgdata;
-+ msg.msg_controllen = sizeof(cmsgdata);
-+
-+ ssize_t ret = recvmsg(aSocket, &msg, MSG_CMSG_CLOEXEC | MSG_DONTWAIT);
-+ if (msg.msg_flags & (MSG_CTRUNC | MSG_TRUNC)) {
-+ Error("WaylandMessage::Read() data truncated, small buffer?");
-+ mFailed = true;
-+ return false;
-+ }
-+
-+ if (ret < 1) {
-+ switch (errno) {
-+ case EAGAIN:
-+ case EINTR:
-+ // Neither loaded nor failed, we'll try again later
-+ Info("WaylandMessage::Write() failed %s\n", strerror(errno));
-+ return false;
-+ default:
-+ Error("WaylandMessage::Write() failed");
-+ mFailed = true;
-+ return false;
-+ }
-+ }
-+
-+ // Set correct data size
-+ mData.resize(ret);
-+
-+ // Read cmsg
-+ struct cmsghdr* header = CMSG_FIRSTHDR(&msg);
-+ while (header) {
-+ struct cmsghdr* next = CMSG_NXTHDR(&msg, header);
-+ if (header->cmsg_level != SOL_SOCKET || header->cmsg_type !=
SCM_RIGHTS) {
-+ header = next;
-+ continue;
-+ }
-+
-+ int* data = (int*)CMSG_DATA(header);
-+ int filenum = (int)((header->cmsg_len - CMSG_LEN(0)) / sizeof(int));
-+ for (int i = 0; i < filenum; i++) {
-+#ifdef DEBUG
-+ int flags = fcntl(data[i], F_GETFL, 0);
-+ if (flags == -1 && errno == EBADF) {
-+ Error("WaylandMessage::Read() invalid fd");
-+ }
-+#endif
-+ mFds.push_back(data[i]);
-+ }
-+ header = next;
-+ }
-+
-+ mLoaded = true;
-+ return true;
-+}
-+
-+bool WaylandMessage::Write(int aSocket) {
-+ if (!mLoaded || mFailed) {
-+ return false;
-+ }
-+
-+ struct msghdr msg = {0};
-+ struct iovec iov = {mData.data(), mData.size()};
-+ msg.msg_iov = &iov;
-+ msg.msg_iovlen = 1;
-+
-+ int filenum = mFds.size();
-+ if (filenum) {
-+ if (filenum >= MAX_LIBWAY_FDS) {
-+ Error("WaylandMessage::Write() too many files to send\n", false);
-+ return false;
-+ }
-+#ifdef DEBUG
-+ for (int i = 0; i < filenum; i++) {
-+ int flags = fcntl(mFds[i], F_GETFL, 0);
-+ if (flags == -1 && errno == EBADF) {
-+ Error("WaylandMessage::Write() invalid fd\n");
-+ }
-+ }
-+#endif
-+ union {
-+ char buf[CMSG_SPACE(sizeof(int) * MAX_LIBWAY_FDS)];
-+ struct cmsghdr align;
-+ } cmsgu;
-+ memset(cmsgu.buf, 0, sizeof(cmsgu.buf));
-+
-+ msg.msg_control = cmsgu.buf;
-+ msg.msg_controllen = sizeof(cmsgu.buf);
-+ msg.msg_controllen = CMSG_SPACE(filenum * sizeof(int));
-+
-+ struct cmsghdr* cmsg = CMSG_FIRSTHDR(&msg);
-+ cmsg->cmsg_level = SOL_SOCKET;
-+ cmsg->cmsg_type = SCM_RIGHTS;
-+ cmsg->cmsg_len = CMSG_LEN(filenum * sizeof(int));
-+ memcpy(CMSG_DATA(cmsg), mFds.data(), filenum * sizeof(int));
-+ }
-+
-+ ssize_t ret = sendmsg(aSocket, &msg, MSG_CMSG_CLOEXEC | MSG_DONTWAIT);
-+ if (ret < 1) {
-+ switch (errno) {
-+ case EAGAIN:
-+ case EINTR:
-+ // Neither loaded nor failed, we'll try again later
-+ Info("WaylandMessage::Write() failed %s\n", strerror(errno));
-+ return false;
-+ default:
-+ Warning("WaylandMessage::Write() failed");
-+ mFailed = true;
-+ return false;
-+ }
-+ }
-+
-+ if (ret != (ssize_t)mData.size()) {
-+ Info("WaylandMessage::Write() failed to write all data! (%d vs. %d)\n",
ret,
-+ mData.size());
-+ }
-+ return true;
-+}
-+
-+ProxiedConnection::~ProxiedConnection() {
-+ if (mCompositorSocket != -1) {
-+ close(mCompositorSocket);
-+ }
-+ if (mApplicationSocket != -1) {
-+ close(mApplicationSocket);
-+ }
-+}
-+
-+bool ProxiedConnection::Init(int aApplicationSocket) {
-+ mApplicationSocket = aApplicationSocket;
-+ mCompositorSocket =
-+ socket(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0);
-+ if (mCompositorSocket == -1) {
-+ Error("ProxiedConnection::Init() socket()");
-+ }
-+ return mApplicationSocket >= 0 && mCompositorSocket >= 0;
-+}
-+
-+struct pollfd* ProxiedConnection::AddToPollFd(struct pollfd* aPfds) {
-+ // Listen application's requests
-+ aPfds->fd = mApplicationSocket;
-+ aPfds->events = POLLIN;
-+
-+ // We're connected and we have data for appplication from compositor.
-+ // Add POLLOUT to request write to app socket.
-+ if (mCompositorConnected && !mToApplicationQueue.empty()) {
-+ aPfds->events |= POLLOUT;
-+ }
-+ aPfds++;
-+
-+ aPfds->fd = mCompositorSocket;
-+ aPfds->events = 0;
-+ // We're waiting for connection or we have data for compositor
-+ if (!mCompositorConnected || !mToCompositorQueue.empty()) {
-+ aPfds->events |= POLLOUT;
-+ }
-+ if (mCompositorConnected) {
-+ aPfds->events |= POLLIN;
-+ }
-+ aPfds++;
-+
-+ return aPfds;
-+}
-+
-+struct pollfd* ProxiedConnection::LoadPollFd(struct pollfd* aPfds) {
-+ if (aPfds->fd != mApplicationSocket) {
-+ return aPfds;
-+ }
-+ mApplicationFlags = aPfds->revents;
-+ aPfds++;
-+ mCompositorFlags = aPfds->revents;
-+ aPfds++;
-+ return aPfds;
-+}
-+
-+bool ProxiedConnection::ConnectToCompositor() {
-+ if (!(mCompositorFlags & POLLOUT)) {
-+ // Try again later
-+ return true;
-+ }
-+
-+ struct sockaddr_un addr = {};
-+ addr.sun_family = AF_UNIX;
-+ strcpy(addr.sun_path, sWaylandDisplay);
-+
-+ mCompositorConnected =
-+ connect(mCompositorSocket, (const struct sockaddr*)&addr,
-+ sizeof(struct sockaddr_un)) != -1;
-+ if (!mCompositorConnected) {
-+ switch (errno) {
-+ case EAGAIN:
-+ case EALREADY:
-+ case ECONNREFUSED:
-+ case EINPROGRESS:
-+ case EINTR:
-+ case EISCONN:
-+ case ETIMEDOUT:
-+ // We can recover from these errors and try again
-+ Warning("ConnectToCompositor() try again");
-+ return true;
-+ default:
-+ Error("ConnectToCompositor() connect()");
-+ return false;
-+ }
-+ }
-+ return true;
-+}
-+
-+// Read data from aSourceSocket and try to twite them to aDestSocket.
-+// If data write fails, append them to aMessageQueue.
-+// Return
-+bool ProxiedConnection::TransferOrQueue(
-+ int aSourceSocket, int aSourcePollFlags, int aDestSocket,
-+ std::vector<std::unique_ptr<WaylandMessage>>* aMessageQueue) {
-+ // Don't read if we don't have any data ready
-+ if (!(aSourcePollFlags & POLLIN)) {
-+ return true;
-+ }
-+
-+ while (1) {
-+ int availableData = 0;
-+ if (ioctl(aSourceSocket, FIONREAD, &availableData) < 0) {
-+ // Broken connection, we're finished here
-+ Warning("ProxiedConnection::TransferOrQueue() broken source socket
%s\n");
-+ return false;
-+ }
-+ if (availableData == 0) {
-+ return true;
-+ }
-+
-+ auto message = std::make_unique<WaylandMessage>(aSourceSocket);
-+ if (message->Failed()) {
-+ // Failed to read message due to error
-+ return false;
-+ }
-+ if (!message->Loaded()) {
-+ // Let's try again
-+ return true;
-+ }
-+ if (!message->Write(aDestSocket)) {
-+ if (message->Failed()) {
-+ // Failed to write and we can't recover
-+ return false;
-+ }
-+ aMessageQueue->push_back(std::move(message));
-+ }
-+ }
-+}
-+
-+// Try to flush all data to aMessageQueue.
-+bool ProxiedConnection::FlushQueue(
-+ int aDestSocket, int aDestPollFlags,
-+ std::vector<std::unique_ptr<WaylandMessage>>& aMessageQueue) {
-+ // Can't write to destination yet
-+ if (!(aDestPollFlags & POLLOUT) || aMessageQueue.empty()) {
-+ return true;
-+ }
-+
-+ std::vector<std::unique_ptr<WaylandMessage>>::iterator message;
-+ for (message = aMessageQueue.begin(); message != aMessageQueue.end();) {
-+ if (!(*message)->Write(aDestSocket)) {
-+ // Failed to write the message, remove whole connection
-+ // as it's broken.
-+ if ((*message)->Failed()) {
-+ return false;
-+ }
-+ break;
-+ }
-+ message++;
-+ }
-+
-+ // Remove all written messages at once.
-+ if (message != aMessageQueue.begin()) {
-+ aMessageQueue.erase(aMessageQueue.begin(), message);
-+ }
-+
-+ return true;
-+}
-+
-+bool ProxiedConnection::Process() {
-+ if (mFailed) {
-+ return false;
-+ }
-+
-+ // Check if appplication is still listening
-+ if (mApplicationFlags & (POLLHUP | POLLERR)) {
-+ return false;
-+ }
-+
-+ // Check if compositor is still listening
-+ if (mCompositorConnected) {
-+ if (mCompositorFlags & (POLLHUP | POLLERR)) {
-+ return false;
-+ }
-+ } else {
-+ // Try to reconnect to compositor.
-+ if (!ConnectToCompositor()) {
-+ Info("Failed to connect to compositor\n");
-+ return false;
-+ }
-+ // We're not connected yet but ConnectToCompositor() didn't return
-+ // fatal error. Try again later.
-+ if (!mCompositorConnected) {
-+ return true;
-+ }
-+ }
-+
-+ mFailed =
-+ !TransferOrQueue(mCompositorSocket, mCompositorFlags,
mApplicationSocket,
-+ &mToApplicationQueue) ||
-+ !TransferOrQueue(mApplicationSocket, mApplicationFlags,
mCompositorSocket,
-+ &mToCompositorQueue) ||
-+ !FlushQueue(mCompositorSocket, mCompositorFlags, mToCompositorQueue)
||
-+ !FlushQueue(mApplicationSocket, mApplicationFlags,
mToApplicationQueue);
-+
-+ return !mFailed;
-+}
-+
-+bool WaylandProxy::SetupWaylandDisplays() {
-+ char* waylandDisplay = getenv("WAYLAND_DISPLAY");
-+ if (!waylandDisplay) {
-+ Error("Init(), Missing Wayland display, WAYLAND_DISPLAY is empty.",
false);
-+ return false;
-+ }
-+
-+ char* XDGRuntimeDir = getenv("XDG_RUNTIME_DIR");
-+ if (!XDGRuntimeDir) {
-+ Error("Init() Missing XDG_RUNTIME_DIR", false);
-+ return false;
-+ }
-+
-+ // WAYLAND_DISPLAY can be absolute path
-+ if (waylandDisplay[0] == '/') {
-+ if (strlen(sWaylandDisplay) >= MAX_WAYLAND_DISPLAY_NAME_LEN) {
-+ Error("Init() WAYLAND_DISPLAY is too large.", false);
-+ return false;
-+ }
-+ strcpy(sWaylandDisplay, waylandDisplay);
-+ } else {
-+ int ret = snprintf(sWaylandDisplay, MAX_WAYLAND_DISPLAY_NAME_LEN,
"%s/%s",
-+ XDGRuntimeDir, waylandDisplay);
-+ if (ret < 0 || ret >= MAX_WAYLAND_DISPLAY_NAME_LEN) {
-+ Error("Init() WAYLAND_DISPLAY/XDG_RUNTIME_DIR is too large.", false);
-+ return false;
-+ }
-+ }
-+ int ret = snprintf(sWaylandProxy, MAX_WAYLAND_DISPLAY_NAME_LEN,
-+ "%s/wayland-proxy-%d", XDGRuntimeDir, getpid());
-+ if (ret < 0 || ret >= MAX_WAYLAND_DISPLAY_NAME_LEN) {
-+ Error("Init() WAYLAND_DISPLAY/XDG_RUNTIME_DIR is too large.", false);
-+ return false;
-+ }
-+
-+ Info("WaylandProxy Wayland '%s' proxy '%s'\n", sWaylandDisplay,
sWaylandProxy);
-+ return true;
-+}
-+
-+bool WaylandProxy::StartProxyServer() {
-+ mProxyServerSocket =
-+ socket(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0);
-+ if (mProxyServerSocket == -1) {
-+ Error("StartProxyServer(): failed to create socket");
-+ return false;
-+ }
-+
-+ struct sockaddr_un serverName = {0};
-+ serverName.sun_family = AF_UNIX;
-+ strcpy(serverName.sun_path, sWaylandProxy);
-+
-+ if (bind(mProxyServerSocket, (struct sockaddr*)&serverName,
-+ sizeof(serverName)) == -1) {
-+ Error("StartProxyServer(): bind() error");
-+ return false;
-+ }
-+ if (listen(mProxyServerSocket, 128) == -1) {
-+ Error("StartProxyServer(): listen() error");
-+ return false;
-+ }
-+
-+ return true;
-+}
-+
-+bool WaylandProxy::Init() {
-+ if (!SetupWaylandDisplays()) {
-+ return false;
-+ }
-+
-+ if (!StartProxyServer()) {
-+ return false;
-+ }
-+ return true;
-+}
-+
-+void WaylandProxy::SetWaylandProxyDisplay() {
-+ setenv("WAYLAND_DISPLAY", sWaylandProxy, true);
-+}
-+
-+void WaylandProxy::SetWaylandDisplay() {
-+ setenv("WAYLAND_DISPLAY", sWaylandDisplay, true);
-+}
-+
-+bool WaylandProxy::IsChildAppTerminated() {
-+ if (!mApplicationPID) {
-+ return false;
-+ }
-+ int status = 0;
-+ int ret = waitpid(mApplicationPID, &status, WNOHANG | WUNTRACED |
WCONTINUED);
-+ if (ret == 0) {
-+ return false;
-+ }
-+ if (ret == mApplicationPID) {
-+ // Child application is terminated, so quit too.
-+ return true;
-+ }
-+ bool terminate = (errno == ECHILD);
-+ Error("IsChildAppTerminated: waitpid() error");
-+ return terminate;
-+}
-+
-+bool WaylandProxy::PollConnections() {
-+ int nfds_max = mConnections.size() * 2 + 1;
-+
-+ struct pollfd pollfds[nfds_max];
-+ struct pollfd* addedPollfd = pollfds;
-+
-+ for (auto const& connection : mConnections) {
-+ addedPollfd = connection->AddToPollFd(addedPollfd);
-+ }
-+ int nfds = (addedPollfd - pollfds);
-+
-+ // If all connections are attached to compositor, add another one
-+ // for new potential connection from application.
-+ bool addNewConnection = mConnections.empty() ||
-+ mConnections.back()->IsConnected();
-+ if (addNewConnection) {
-+ addedPollfd->fd = mProxyServerSocket;
-+ addedPollfd->events = POLLIN;
-+ nfds++;
-+ }
-+ assert(addedPollfd < pollfds + nfds_max);
-+
-+ while (1) {
-+ int ret = poll(pollfds, nfds, POLL_TIMEOUT);
-+ if (ret == 0) {
-+ // No change on fds
-+ continue;
-+ } else if (ret > 0) {
-+ // We have FD to read
-+ break;
-+ } else if (ret == -1) {
-+ switch (errno) {
-+ case EINTR:
-+ case EAGAIN:
-+ if (IsChildAppTerminated()) {
-+ return false;
-+ }
-+ continue;
-+ default:
-+ Error("Run: poll() error");
-+ return false;
-+ }
-+ }
-+ }
-+
-+ struct pollfd* loadedPollfd = pollfds;
-+ for (auto const& connection : mConnections) {
-+ loadedPollfd = connection->LoadPollFd(loadedPollfd);
-+ }
-+
-+ assert(loadedPollfd == addedPollfd);
-+ assert(loadedPollfd < pollfds + nfds_max);
-+
-+ // Create a new connection if there's a new client waiting
-+ if (addNewConnection && (loadedPollfd->revents & POLLIN)) {
-+ Info("WaylandProxy: new child connection\n");
-+ int applicationSocket = accept4(loadedPollfd->fd, nullptr, nullptr,
-+ SOCK_NONBLOCK | SOCK_CLOEXEC);
-+ if (applicationSocket == -1) {
-+ switch (errno) {
-+ case EAGAIN:
-+ case EINTR:
-+ // Try again later
-+ break;
-+ default:
-+ Error("Faild to accept connection from application");
-+ return false;
-+ }
-+ } else {
-+ auto connection = std::make_unique<ProxiedConnection>();
-+ if (connection->Init(applicationSocket)) {
-+ mConnections.push_back(std::move(connection));
-+ }
-+ }
-+ }
-+
-+ return true;
-+}
-+
-+bool WaylandProxy::ProcessConnections() {
-+ std::vector<std::unique_ptr<ProxiedConnection>>::iterator connection;
-+ for (connection = mConnections.begin(); connection !=
mConnections.end();) {
-+ if (!(*connection)->Process()) {
-+ Info("WaylandProxy: remove connection\n");
-+ connection = mConnections.erase(connection);
-+ if (mConnections.empty()) {
-+ // We removed last connection - quit.
-+ Info("WaylandProxy: removed last connection, quit\n");
-+ return false;
-+ }
-+ } else {
-+ connection++;
-+ }
-+ }
-+ return true;
-+}
-+
-+void WaylandProxy::Run() {
-+ while (!IsChildAppTerminated() && PollConnections() &&
ProcessConnections())
-+ ;
-+}
-+
-+WaylandProxy::~WaylandProxy() {
-+ Info("WaylandProxy terminated\n");
-+ if (mThreadRunning) {
-+ Info("WaylandProxy thread is still running, terminating.\n");
-+ mThreadRunning = false;
-+ pthread_cancel(mThread);
-+ pthread_join(mThread, nullptr);
-+ }
-+ unlink(sWaylandProxy);
-+ if (mProxyServerSocket != -1) {
-+ close(mProxyServerSocket);
-+ }
-+ SetWaylandDisplay();
-+}
-+
-+void* WaylandProxy::RunProxyThread(WaylandProxy* aProxy) {
-+#ifdef __linux__
-+ pthread_setname_np(pthread_self(), "WaylandProxy");
-+#endif
-+ aProxy->Run();
-+ Info("WaylandProxy thread exited\n");
-+ return nullptr;
-+}
-+
-+std::unique_ptr<WaylandProxy> WaylandProxy::Create() {
-+ auto proxy = std::make_unique<WaylandProxy>();
-+ if (!proxy->Init()) {
-+ return nullptr;
-+ }
-+
-+ Info("WaylandProxyCreated, display %s\n", sWaylandProxy);
-+ return proxy;
-+}
-+
-+bool WaylandProxy::RunChildApplication(char* argv[]) {
-+ if (!argv[0]) {
-+ Error("WaylandProxy::RunChildApplication: missing application to run",
false);
-+ return false;
-+ }
-+
-+ mApplicationPID = fork();
-+ if (mApplicationPID == -1) {
-+ Error("WaylandProxy::RunChildApplication: fork() error");
-+ return false;
-+ }
-+ if (mApplicationPID == 0) {
-+ SetWaylandProxyDisplay();
-+ if (execv(argv[0], argv) == -1) {
-+ ErrorPlain("WaylandProxy::RunChildApplication: failed to run %s error
%s\n", argv[0], strerror(errno));
-+ exit(1);
-+ }
-+ }
-+
-+ Run();
-+ return true;
-+}
-+
-+bool WaylandProxy::RunThread() {
-+ pthread_attr_t attr;
-+ if (pthread_attr_init(&attr) != 0) {
-+ return false;
-+ }
-+
-+ sched_param param;
-+ if (pthread_attr_getschedparam(&attr, &param) == 0) {
-+ param.sched_priority = sched_get_priority_min(SCHED_RR);
-+ pthread_attr_setschedparam(&attr, &param);
-+ }
-+
-+ SetWaylandProxyDisplay();
-+
-+ mThreadRunning = pthread_create(&mThread, nullptr, (void*
(*)(void*))RunProxyThread, this) == 0;
-+ if (!mThreadRunning) {
-+ // If we failed to run proxy thread, set WAYLAND_DISPLAY back.
-+ SetWaylandDisplay();
-+ }
-+
-+ pthread_attr_destroy(&attr);
-+ return mThreadRunning;
-+}
-+
-+void WaylandProxy::SetVerbose(bool aVerbose) { sPrintInfo = aVerbose; }
-diff --git a/third_party/wayland-proxy/wayland-proxy.h
b/third_party/wayland-proxy/wayland-proxy.h
-new file mode 100644
---- /dev/null
-+++ b/third_party/wayland-proxy/wayland-proxy.h
-@@ -0,0 +1,58 @@
-+/* -*- Mode: C++; tab-width: 2; 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/. */
-+
-+#ifndef _wayland_proxy_h_
-+#define _wayland_proxy_h_
-+
-+#include <poll.h>
-+#include <vector>
-+#include <fcntl.h>
-+#include <atomic>
-+#include <memory>
-+
-+class ProxiedConnection;
-+
-+class WaylandProxy {
-+ public:
-+ static std::unique_ptr<WaylandProxy> Create();
-+
-+ // Launch an application with Wayland proxy set
-+ bool RunChildApplication(char* argv[]);
-+
-+ // Run proxy as part of already running application
-+ // and set Wayland proxy display for it.
-+ bool RunThread();
-+
-+ // Set original Wayland display env variable.
-+ void SetWaylandDisplay();
-+
-+ static void SetVerbose(bool aVerbose);
-+
-+ ~WaylandProxy();
-+
-+ private:
-+ bool Init();
-+ void Run();
-+
-+ void SetWaylandProxyDisplay();
-+ static void* RunProxyThread(WaylandProxy* aProxy);
-+
-+ bool SetupWaylandDisplays();
-+ bool StartProxyServer();
-+ bool IsChildAppTerminated();
-+
-+ bool PollConnections();
-+ bool ProcessConnections();
-+
-+ private:
-+ // List of all Compositor <-> Application connections
-+ std::vector<std::unique_ptr<ProxiedConnection>> mConnections;
-+ int mProxyServerSocket = -1;
-+ pid_t mApplicationPID = 0;
-+ std::atomic<bool> mThreadRunning = false;
-+ pthread_t mThread;
-+};
-+
-+#endif // _wayland_proxy_h_
-diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
---- a/widget/gtk/moz.build
-+++ b/widget/gtk/moz.build
-@@ -18,17 +18,17 @@ with Files("*IMContextWrapper*"):
-
- with Files("*nsGtkKeyUtils*"):
- BUG_COMPONENT = ("Core", "DOM: UI Events & Focus Handling")
-
- if CONFIG["COMPILE_ENVIRONMENT"]:
- DIRS += ["mozgtk"]
-
- if CONFIG["MOZ_WAYLAND"]:
-- DIRS += ["wayland", "mozwayland"]
-+ DIRS += ["wayland", "mozwayland", "../../third_party/wayland-proxy"]
-
- if CONFIG["MOZ_ENABLE_VAAPI"]:
- DIRS += ["vaapitest"]
-
- if CONFIG["MOZ_ENABLE_V4L2"]:
- DIRS += ["v4l2test"]
-
- EXPORTS += [
-
-
-# HG changeset patch
-# User stransky <stransky AT redhat.com>
-# Date 1704803102 0
-# Node ID b0d2efdcd6cc0254d9c02cf82e7fe83c09d32e89
-# Parent 6a0659188d6c3d77231a59f836c1a42462d2725c
-Bug 1743144 [Wayland] Enable Wayland proxy on start r=emilio
-
-Differential Revision: https://phabricator.services.mozilla.com/D196555
-
-diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
---- a/toolkit/xre/nsAppRunner.cpp
-+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -339,23 +339,34 @@ nsString gProcessStartupShortcut;
-
- #if defined(MOZ_WIDGET_GTK)
- # include <glib.h>
- # include "mozilla/WidgetUtilsGtk.h"
- # include <gtk/gtk.h>
- # ifdef MOZ_WAYLAND
- # include <gdk/gdkwayland.h>
- # include "mozilla/widget/nsWaylandDisplay.h"
-+# include "wayland-proxy.h"
- # endif
- # ifdef MOZ_X11
- # include <gdk/gdkx.h>
- # endif /* MOZ_X11 */
- #endif
-+
-+#if defined(MOZ_WAYLAND)
-+std::unique_ptr<WaylandProxy> gWaylandProxy;
-+#endif
-+
- #include "BinaryPath.h"
-
-+#ifdef MOZ_LOGGING
-+# include "mozilla/Logging.h"
-+extern mozilla::LazyLogModule gWidgetWaylandLog;
-+#endif /* MOZ_LOGGING */
-+
- #ifdef FUZZING
- # include "FuzzerRunner.h"
-
- namespace mozilla {
- FuzzerRunner* fuzzerRunner = 0;
- } // namespace mozilla
-
- # ifdef LIBFUZZER
-@@ -2787,16 +2798,19 @@ static ReturnAbortOnError ProfileLockedD
- SaveFileToEnv("XRE_PROFILE_LOCAL_PATH", aProfileLocalDir);
-
- #if defined(MOZ_HAS_REMOTE)
- if (gRemoteService) {
- gRemoteService->UnlockStartup();
- gRemoteService = nullptr;
- }
- #endif
-+#if defined(MOZ_WAYLAND)
-+ gWaylandProxy = nullptr;
-+#endif
- return LaunchChild(false, true);
- }
- } else {
- rv = ps->Alert(nullptr, killTitle.get(), killMessage.get());
- NS_ENSURE_SUCCESS_LOG(rv, rv);
- }
-
- return NS_ERROR_ABORT;
-@@ -2901,16 +2915,19 @@ static ReturnAbortOnError ShowProfileMan
- gRestartArgv[gRestartArgc] = nullptr;
- }
- #if defined(MOZ_HAS_REMOTE)
- if (gRemoteService) {
- gRemoteService->UnlockStartup();
- gRemoteService = nullptr;
- }
- #endif
-+#if defined(MOZ_WAYLAND)
-+ gWaylandProxy = nullptr;
-+#endif
- return LaunchChild(false, true);
- }
-
- static bool gDoMigration = false;
- static bool gDoProfileReset = false;
- static nsCOMPtr<nsIToolkitProfile> gResetOldProfile;
-
- static nsresult LockProfile(nsINativeAppSupport* aNative, nsIFile* aRootDir,
-@@ -4706,26 +4723,42 @@ int XREMain::XRE_mainStartup(bool* aExit
- XInitThreads();
- }
- #endif
- #if defined(MOZ_WIDGET_GTK)
- if (!isBackgroundTaskMode && !gfxPlatform::IsHeadless()) {
- const char* display_name = nullptr;
- bool saveDisplayArg = false;
-
-+ bool waylandEnabled = IsWaylandEnabled();
-+# ifdef MOZ_WAYLAND
-+ auto* proxyEnv = getenv("MOZ_DISABLE_WAYLAND_PROXY");
-+ bool disableWaylandProxy = proxyEnv && *proxyEnv;
-+ if (!disableWaylandProxy && XRE_IsParentProcess() && waylandEnabled) {
-+# ifdef MOZ_LOGGING
-+ if (MOZ_LOG_TEST(gWidgetWaylandLog, mozilla::LogLevel::Debug)) {
-+ WaylandProxy::SetVerbose(true);
-+ }
-+# endif
-+ gWaylandProxy = WaylandProxy::Create();
-+ if (gWaylandProxy) {
-+ gWaylandProxy->RunThread();
-+ }
-+ }
-+# endif
-+
- // display_name is owned by gdk.
- display_name = gdk_get_display_arg_name();
- // if --display argument is given make sure it's
- // also passed to ContentChild::Init() by MOZ_GDK_DISPLAY.
- if (display_name) {
- SaveWordToEnv("MOZ_GDK_DISPLAY", nsDependentCString(display_name));
- saveDisplayArg = true;
- }
-
-- bool waylandEnabled = IsWaylandEnabled();
- // On Wayland disabled builds read X11 DISPLAY env exclusively
- // and don't care about different displays.
- if (!waylandEnabled && !display_name) {
- display_name = PR_GetEnv("DISPLAY");
- if (!display_name) {
- PR_fprintf(PR_STDERR,
- "Error: no DISPLAY environment variable specified\n");
- return 1;
-@@ -5954,16 +5987,17 @@ int XREMain::XRE_main(int argc, char* ar
- mozilla::AppShutdown::MaybeDoRestart();
-
- #ifdef MOZ_WIDGET_GTK
- // gdk_display_close also calls gdk_display_manager_set_default_display
- // appropriately when necessary.
- if (!gfxPlatform::IsHeadless()) {
- # ifdef MOZ_WAYLAND
- WaylandDisplayRelease();
-+ gWaylandProxy = nullptr;
- # endif
- }
- #endif
-
- XRE_DeinitCommandLine();
-
- if (NS_FAILED(rv)) {
- return 1;
-
-
diff --git
a/http/firefox/patches/0028-bgo-919418-ppc64-flac-decoder-unsupported.patch
b/http/firefox/patches/0028-bgo-919418-ppc64-flac-decoder-unsupported.patch
deleted file mode 100644
index 660b1ff..0000000
---
a/http/firefox/patches/0028-bgo-919418-ppc64-flac-decoder-unsupported.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/dom/media/flac/FlacDecoder.cpp 2023-11-23 07:59:17.466486168 -0500
-+++ b/dom/media/flac/FlacDecoder.cpp 2023-11-23 08:00:49.048026379 -0500
-@@ -18,7 +18,7 @@
- #elif defined(MOZ_FFMPEG)
- RefPtr<PDMFactory> platform = new PDMFactory();
- return StaticPrefs::media_flac_enabled() &&
-- (platform->SupportsMimeType("audio/flac"_ns) !=
media::DecodeSupport::Unsupported);
-+ !(platform->SupportsMimeType("audio/flac"_ns).isEmpty());
- #else
- return false;
- #endif
diff --git
a/http/firefox/patches/0029-bmo-1793001-switch-egrep-to-grepE.patch
b/http/firefox/patches/0029-bmo-1793001-switch-egrep-to-grepE.patch
deleted file mode 100644
index 6f8bb92..0000000
--- a/http/firefox/patches/0029-bmo-1793001-switch-egrep-to-grepE.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-
-# HG changeset patch
-# User serge-sans-paille <sguelton AT mozilla.com>
-# Date 1705502237 0
-# Node ID fba2b83c6fe029b15ea8d4573961321908eb9a4c
-# Parent 0a29fd63bff9404c9db0783f0b16b2b76d39ddb4
-Bug 1793001 - s/egrep/grep -E/ r=ahochheiden
-
-Differential Revision: https://phabricator.services.mozilla.com/D197508
-
-diff --git a/build/autoconf/acgeneral.m4 b/build/autoconf/acgeneral.m4
---- a/build/autoconf/acgeneral.m4
-+++ b/build/autoconf/acgeneral.m4
-@@ -1699,17 +1699,17 @@ cat > conftest.$ac_ext <<EOF
- #include "confdefs.h"
- [$2]
- EOF
- dnl eval is necessary to expand ac_cpp.
- dnl Ultrix and Pyramid sh refuse to redirect output of eval, so use
subshell.
- if (eval "$ac_cpp conftest.$ac_ext") 2>&AC_FD_CC |
- dnl Prevent m4 from eating character classes:
- changequote(, )dnl
-- egrep "$1" >/dev/null 2>&1; then
-+ grep -E "$1" >/dev/null 2>&1; then
- changequote([, ])dnl
- ifelse([$3], , :, [rm -rf conftest*
- $3])
- ifelse([$4], , , [else
- rm -rf conftest*
- $4
- ])dnl
- fi
-diff --git a/build/autoconf/acspecific.m4 b/build/autoconf/acspecific.m4
---- a/build/autoconf/acspecific.m4
-+++ b/build/autoconf/acspecific.m4
-@@ -255,31 +255,31 @@ cross_compiling=$ac_cv_prog_f77_cross
- AC_DEFUN(AC_PROG_CC_GNU,
- [AC_CACHE_CHECK(whether we are using GNU C, ac_cv_prog_gcc,
- [dnl The semicolon is to pacify NeXT's syntax-checking cpp.
- cat > conftest.c <<EOF
- #ifdef __GNUC__
- yes;
- #endif
- EOF
--if AC_TRY_COMMAND(${CC-cc} -E conftest.c) | egrep yes >/dev/null 2>&1; then
-+if AC_TRY_COMMAND(${CC-cc} -E conftest.c) | grep -E yes >/dev/null 2>&1;
then
- ac_cv_prog_gcc=yes
- else
- ac_cv_prog_gcc=no
- fi])])
-
- AC_DEFUN(AC_PROG_CXX_GNU,
- [AC_CACHE_CHECK(whether we are using GNU C++, ac_cv_prog_gxx,
- [dnl The semicolon is to pacify NeXT's syntax-checking cpp.
- cat > conftest.C <<EOF
- #ifdef __GNUC__
- yes;
- #endif
- EOF
--if AC_TRY_COMMAND(${CXX-g++} -E conftest.C) | egrep yes >/dev/null 2>&1;
then
-+if AC_TRY_COMMAND(${CXX-g++} -E conftest.C) | grep -E yes >/dev/null 2>&1;
then
- ac_cv_prog_gxx=yes
- else
- ac_cv_prog_gxx=no
- fi])])
-
- dnl Test whether for Fortran 77 compiler is `g77' (the GNU Fortran 77
- dnl Compiler). This test depends on whether the Fortran 77 compiler can
- dnl do CPP pre-processing.
-@@ -287,17 +287,17 @@ dnl
- dnl AC_PROG_F77_GNU()
- AC_DEFUN(AC_PROG_F77_GNU,
- [AC_CACHE_CHECK(whether we are using GNU Fortran 77, ac_cv_prog_g77,
- [cat > conftest.fpp <<EOF
- #ifdef __GNUC__
- yes
- #endif
- EOF
--if AC_TRY_COMMAND($F77 -E conftest.fpp) | egrep yes >/dev/null 2>&1; then
-+if AC_TRY_COMMAND($F77 -E conftest.fpp) | grep -E yes >/dev/null 2>&1; then
- ac_cv_prog_g77=yes
- else
- ac_cv_prog_g77=no
- fi])])
-
- AC_DEFUN(AC_PROG_CC_G,
- [AC_CACHE_CHECK(whether ${CC-cc} accepts -g, ac_cv_prog_cc_g,
- [echo 'void f(){}' > conftest.c
-diff --git a/js/src/old-configure.in b/js/src/old-configure.in
---- a/js/src/old-configure.in
-+++ b/js/src/old-configure.in
-@@ -613,17 +613,17 @@ then
- dnl See if -pthread is supported.
- dnl
- rm -f conftest*
- ac_cv_have_dash_pthread=no
- AC_MSG_CHECKING(whether ${CC-cc} accepts -pthread)
- echo 'int main() { return 0; }' | cat > conftest.c
- ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
- if test $? -eq 0; then
-- if test -z "`egrep -i '(unrecognize|unknown)' conftest.out |
grep pthread`" -a -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
-+ if test -z "`grep -E -i '(unrecognize|unknown)' conftest.out
| grep pthread`" -a -z "`grep -E -i '(error|incorrect)' conftest.out`" ; then
- ac_cv_have_dash_pthread=yes
- case "$target_os" in
- freebsd*)
- # Freebsd doesn't use -pthread for compiles, it uses them for linking
- ;;
- *)
- CFLAGS="$CFLAGS -pthread"
- CXXFLAGS="$CXXFLAGS -pthread"
-@@ -638,17 +638,17 @@ then
- dnl See if -pthreads is supported.
- dnl
- ac_cv_have_dash_pthreads=no
- if test "$ac_cv_have_dash_pthread" = "no"; then
- AC_MSG_CHECKING(whether ${CC-cc} accepts -pthreads)
- echo 'int main() { return 0; }' | cat > conftest.c
- ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1
- if test $? -eq 0; then
-- if test -z "`egrep -i '(unrecognize|unknown)' conftest.out |
grep pthreads`" -a -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
-+ if test -z "`grep -E -i '(unrecognize|unknown)' conftest.out
| grep pthreads`" -a -z "`grep -E -i '(error|incorrect)' conftest.out`" ; then
- ac_cv_have_dash_pthreads=yes
- CFLAGS="$CFLAGS -pthreads"
- CXXFLAGS="$CXXFLAGS -pthreads"
- fi
- fi
- rm -f conftest*
- AC_MSG_RESULT($ac_cv_have_dash_pthreads)
- fi
-diff --git a/old-configure.in b/old-configure.in
---- a/old-configure.in
-+++ b/old-configure.in
-@@ -652,17 +652,17 @@ then
- dnl See if -pthread is supported.
- dnl
- rm -f conftest*
- ac_cv_have_dash_pthread=no
- AC_MSG_CHECKING(whether ${CC-cc} accepts -pthread)
- echo 'int main() { return 0; }' | cat > conftest.c
- ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
- if test $? -eq 0; then
-- if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep
pthread`" -a -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
-+ if test -z "`grep -E -i '(unrecognize|unknown)' conftest.out | grep
pthread`" -a -z "`grep -E -i '(error|incorrect)' conftest.out`" ; then
- ac_cv_have_dash_pthread=yes
- case "$target_os" in
- freebsd*)
- # Freebsd doesn't use -pthread for compiles, it uses them for linking
- ;;
- *)
- CFLAGS="$CFLAGS -pthread"
- CXXFLAGS="$CXXFLAGS -pthread"
-@@ -677,17 +677,17 @@ then
- dnl See if -pthreads is supported.
- dnl
- ac_cv_have_dash_pthreads=no
- if test "$ac_cv_have_dash_pthread" = "no"; then
- AC_MSG_CHECKING(whether ${CC-cc} accepts -pthreads)
- echo 'int main() { return 0; }' | cat > conftest.c
- ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1
- if test $? -eq 0; then
-- if test -z "`egrep -i '(unrecognize|unknown)' conftest.out |
grep pthreads`" -a -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
-+ if test -z "`grep -E -i '(unrecognize|unknown)' conftest.out |
grep pthreads`" -a -z "`grep -E -i '(error|incorrect)' conftest.out`" ; then
- ac_cv_have_dash_pthreads=yes
- CFLAGS="$CFLAGS -pthreads"
- CXXFLAGS="$CXXFLAGS -pthreads"
- fi
- fi
- rm -f conftest*
- AC_MSG_RESULT($ac_cv_have_dash_pthreads)
- fi
-


  • [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (584fab864f8790ecd77aaf6559d7ac88689df473), Pavel Vinogradov, 02/20/2024

Archive powered by MHonArc 2.6.24.

Top of Page