From nobody Fri Mar 1 08:18:45 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TmLZt0YqBz5C9pC; Fri, 1 Mar 2024 08:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TmLZs5fWtz4rSy; Fri, 1 Mar 2024 08:18:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709281125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Xi4q5++C+6dW0RN4Jnt3ANAczz48/NEogJJSmNxaCk=; b=hJQG+iW76w71RrO0oWTZLb8YC37PP37oSow58YBPO7maxmZkgtXE1SbcA8e1SgBCGXelws zCWiCAK1tc7+KLkRb34+3KMElAxc+BcNz3pY0odc2pfMZLymWc2Kghst9NN9MFixw1ovFb XFaRY7eJCDhne5Cp4/ylg9H0qul6pV6UZyG2uh+CkJWzvR1JQZwG34mgH3l/GOw677PgCJ /ikdKf/SWkmBhRYEhPImD8G10Y6Mzi8CTPWJvdhxtdyRNi1GZroT170M4ykzrOXh8YeRVS Fbx6NDi7RX43P1Ea2n1TG38PTL+Spe/mFuWz6AeG9DYzQiMq1Kn0KK9QTNh9Xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709281125; a=rsa-sha256; cv=none; b=tcA6/R/cYAxNZF8YvhHZwni59CPVyGWeLpvLOEO32JLpm+iQoWQCutFLgx3Nc2/Vq//92d LTSJGt1+sm1ijkO6aH15nnqXV8qOahqibEWJqFWQzKSttfKS1ApXGZ2r490bYC60IzAV/B rk2hAZ0Y6XG2LjQWJRr1auvEU9jhBsZ19QoUdodAdEtSkv3MD6fENeEfgXbIQ/WBd2DkES rGEZNGUnSgLtOLDycacBNX32JFqZYP3X5xR9HQbRcxSUEvNT9iKORNaSIDzj+jEq5gP4Rl pnHbviVXyomD4rVoukMPpgAIHMOCSwcXiLbos+vXtR7++wL0ojA9fIa0XgqJXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709281125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Xi4q5++C+6dW0RN4Jnt3ANAczz48/NEogJJSmNxaCk=; b=bVDQW05eDirqaezQlAk5dV2nOgFYTLq+STNONL0DPYzSlnalsqWdd+Q7aXHekkR8RUWBTP 2tQA4xxJfuWIh7U81e9t+AHT+2JR80bDi0mHFnmJ/b0jdRn2cdH5BZCYV5Sq9wOfmPhvCo UimOY38/AICQtW4iUI0D316s2D9mMmmzq6r7K0mSQAHNUJVDxpUPkP0/GbkClo636rEdfo SkYC1eQvlT0i4HqREWzu+ie/tFGGAWSoPcehDpszptl3PZpLtlMDP1u1gvtDeepGiptRw1 Rr8r1vcghzOSjn3MW3TXO6R7pfKMOWkU8pj3Ffsw9hgyZ/ClWMKEWVn3whKZOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TmLZs59CczJXf; Fri, 1 Mar 2024 08:18:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4218Ijeo033626; Fri, 1 Mar 2024 08:18:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4218IjJu033623; Fri, 1 Mar 2024 08:18:45 GMT (envelope-from git) Date: Fri, 1 Mar 2024 08:18:45 GMT Message-Id: <202403010818.4218IjJu033623@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: ff7cc7c71946 - main - www/firefox: fix running on wayland List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff7cc7c71946fef795832da65686dff06c0f7d47 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=ff7cc7c71946fef795832da65686dff06c0f7d47 commit ff7cc7c71946fef795832da65686dff06c0f7d47 Author: Baptiste Daroussin AuthorDate: 2024-03-01 07:58:07 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-01 07:58:07 +0000 www/firefox: fix running on wayland since the latest version firefox uses a wayland-proxy to deal with disconnections from the compositor, this proxy had portability issue in particular it relies on a non defined behaviour polling a non connected socket, remove the test on the polling to make it run on FreeBSD Note for users running into other issues with wayland-proxy they can for now disable it via: MOZ_DISABLE_WAYLAND_PROXY=1 env var. This has been reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1882972 https://github.com/stransky/wayland-proxy/issues/3 https://github.com/stransky/wayland-proxy/pull/6 Reviewd by: manu Tested by: manu --- www/firefox/Makefile | 2 +- www/firefox/files/patch-wayland-proxy | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 651c4f8ba9eb..6d64abfa085d 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,6 +1,6 @@ PORTNAME= firefox DISTVERSION= 123.0 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 2 CATEGORIES= www wayland MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \ diff --git a/www/firefox/files/patch-wayland-proxy b/www/firefox/files/patch-wayland-proxy new file mode 100644 index 000000000000..d9cb16bd2215 --- /dev/null +++ b/www/firefox/files/patch-wayland-proxy @@ -0,0 +1,15 @@ +--- third_party/wayland-proxy/wayland-proxy.cpp.orig 2024-02-29 09:10:59.939556000 +0100 ++++ third_party/wayland-proxy/wayland-proxy.cpp 2024-02-29 15:07:13.914375000 +0100 +@@ -318,10 +318,10 @@ + } + + bool ProxiedConnection::ConnectToCompositor() { +- if (!(mCompositorFlags & POLLOUT)) { ++ /* if (!(mCompositorFlags & POLLOUT)) { + // Try again later + return true; +- } ++ }*/ + + struct sockaddr_un addr = {}; + addr.sun_family = AF_UNIX;